This patch fixes the broken build for x86 target with glibc as reported
in ticket# 6788.

By not disabling tls support for the first GCC stages, glibc can be
build with tls support (configure says it needs __thread).
Support for the final stage is still defined by CONFIG_TLS_SUPPORT.

Any feedback?

Regards, Mark
This patch fixes the broken build for x86 target with glibc as reported in ticket# 6788.

By not disabling tls support for the first GCC stages, glibc can be build with tls support (configure says it needs __thread).
Support for the final stage is still defined by CONFIG_TLS_SUPPORT.

Signed-off-by: Mark Vels <[email protected]>


diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 8b92060..679fd31 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -116,11 +116,6 @@ else
 		--disable-libssp
 endif
 
-ifeq ($(CONFIG_TLS_SUPPORT),)
-  GCC_CONFIGURE+= \
-		--disable-tls
-endif
-
 ifneq ($(CONFIG_EXTRA_TARGET_ARCH),)
   GCC_CONFIGURE+= \
 		--enable-biarch \
@@ -159,6 +154,11 @@ GCC_CONFIGURE_STAGE2:= \
 		--enable-threads \
 		--with-slibdir=$(TOOLCHAIN_DIR)/lib \
 
+ifeq ($(CONFIG_TLS_SUPPORT),)
+  GCC_CONFIGURE_STAGE2+= \
+		--disable-tls
+endif
+
 ifdef CONFIG_powerpc
   TARGET_CFLAGS := $(patsubst -Os,-O2,$(TARGET_CFLAGS))
 endif
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to