Skip to contentSkip to conversation

Add a config option for gcc tls support, rather than disabling it blindly

PATCH New Austin Foxley 2 participants 2 messages Sep 20, 2009 – Sep 23, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Add a config option for gcc tls support, rather than disabling it blindly

Defaulted to yes, but blocked it from gcc 4.4.x since the disable was originally added because of problems with its c++ support reportedly.

---
 toolchain/gcc/Config.in         |    7 +++++++
 toolchain/gcc/gcc-uclibc-4.x.mk |   12 +++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)
toolchain/gcc/Config.in +7 -0
index 279e101..db7e32e 100644
@@ -175,3 +175,10 @@ config BR2_GCC_SHARED_LIBGCC
 	help
 	  Build/install a shared libgcc library
 
+config BR2_GCC_ENABLE_TLS
+	bool "Enable compiler tls support"
+	default y
+	depends on !BR2_GCC_VERSION_4_4_X
+	help
+	  Enable the compiler to generate code for accessing
+	  thread local storage variables
toolchain/gcc/gcc-uclibc-4.x.mk +9 -3
index 4129152..494984b 100644
@@ -137,6 +137,12 @@ else
 GCC_SHARED_LIBGCC:=--disable-shared
 endif
 
+ifeq ($(BR2_GCC_ENABLE_TLS),y)
+GCC_TLS:=--enable-tls
+else
+GCC_TLS:=--disable-tls
+endif
+
 ifeq ($(BR2_KERNEL_HURD),y)
 EXTRA_GCC1_CONFIG_OPTIONS+=--without-headers
 endif
@@ -219,7 +225,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
 		--with-gnu-ld \
 		--disable-shared \
 		--disable-libssp \
-		--disable-tls \
+		$(GCC_TLS) \
 		$(GCC_WITH_HOST_GMP) \
 		$(GCC_WITH_HOST_MPFR) \
 		$(DISABLE_NLS) \
@@ -295,7 +301,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)
 		--enable-target-optspace \
 		--with-gnu-ld \
 		--disable-libssp \
-		--disable-tls \
+		$(GCC_TLS) \
 		$(GCC_SHARED_LIBGCC) \
 		$(GCC_WITH_HOST_GMP) \
 		$(GCC_WITH_HOST_MPFR) \
@@ -422,7 +428,7 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared
 		--disable-__cxa_atexit \
 		--with-gnu-ld \
 		--disable-libssp \
-		--disable-tls \
+		$(GCC_TLS) \
 		$(GCC_SHARED_LIBGCC) \
 		$(GCC_WITH_TARGET_GMP) \
 		$(GCC_WITH_TARGET_MPFR) \
Signature · 1 line
1.6.2.5
#1 lore raw

PATCH 1/1 Add a config option for gcc tls support, rather than disabling it blindly

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Austin" == Austin Foxley <[email protected]> writes:

Austin> Defaulted to yes, but blocked it from gcc 4.4.x since the disable was Austin> originally added because of problems with its c++ support reportedly.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard