Make TLS support a selectable option (synch with trunk).

Automatically enabled when using NPTL.

1 files changed, 13 insertions, 7 deletions

diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
index e6ea80a42..d5742e341 100644
--- a/extra/Configs/Config.in
+++ b/extra/Configs/Config.in
@@ -372,6 +372,16 @@ config UCLIBC_HAS_THREADS
 
 	  If your applications require pthreads, answer Y.
 
+config UCLIBC_HAS_TLS
+	bool "Thread-Local Storage"
+	depends on UCLIBC_HAS_THREADS
+	default n
+	help
+	  If you want to enable TLS support then answer Y.
+	  This is fast an efficient way to store per-thread local data
+	  which is not on stack. It needs __thread support enabled in
+	  gcc.
+
 config PTHREADS_DEBUG_SUPPORT
 	bool "Build pthreads debugging support"
 	default n
@@ -407,6 +417,7 @@ config UCLIBC_HAS_THREADS_NATIVE
 	bool "Native POSIX Threading (NPTL) Support"
 	depends on UCLIBC_HAS_THREADS
 	default n
+	select UCLIBC_HAS_TLS
 	help
 	  If you want to compile uClibc with NPTL support, then answer Y.
 
@@ -1257,17 +1268,12 @@ config UCLIBC_PREGENERATED_LOCALE_DATA
 	depends on UCLIBC_HAS_LOCALE
 	default n
 	help
-	  If you are selective and only want locale data for a few particular
-	  locales, you can turn this option off.
-
-	  Mere mortals will answer Y and use the default set of pregenerated
-	  locale data, which supports 169 UTF-8 locales, and 144 locales for
-	  other codesets (for the complete list see extra/locale/LOCALES).
+	  Use pre-built locale data.
 
 	  Note that these pregenerated locales are sensitive to your
 	  target architecture (endianess, bitcount).
 
-	  Saying N here is recommended.
+	  Saying N here is highly recommended.
 
 config UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA
 	bool "Automagically Download the Pre-generated Locale Data (if necessary)"