gcc: only enable/disable TLS support in final stage (closes: #6788)

SVN-Revision: 20018
15 years ago · 10d11328ef
parent 2e757a6692
commit 10d11328ef
1 changed files with 8 additions and 5 deletions
--- 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,14 @@ GCC_CONFIGURE_STAGE2:= \
 		--enable-threads \
 		--with-slibdir=$(TOOLCHAIN_DIR)/lib \

+ifneq ($(CONFIG_TLS_SUPPORT),)
+  GCC_CONFIGURE_STAGE2+= \
+		--enable-tls
+else
+  GCC_CONFIGURE_STAGE2+= \
+		--disable-tls
+endif
+
 ifdef CONFIG_powerpc
  TARGET_CFLAGS := $(patsubst -Os,-O2,$(TARGET_CFLAGS))
 endif