Use __UCLIBC_HAS_TLS__ (now available) as guard for TLS related

stuff, instead of __UCLIBC_HAS_THREADS_NATIVE__.
This is in preparation on trunk merge to make TLS compatible
with LT (new) and NPTL.

Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>

8 files changed, 11 insertions, 11 deletions

diff --git a/include/errno.h b/include/errno.h
index 9f7442713..85268f053 100644
--- a/include/errno.h
+++ b/include/errno.h
@@ -58,7 +58,7 @@ extern const char *program_invocation_name, *program_invocation_short_name;
 
 __END_DECLS
 
-#if defined _LIBC && defined __UCLIBC_HAS_THREADS_NATIVE__
+#if defined _LIBC && defined __UCLIBC_HAS_TLS__
 # if !defined NOT_IN_libc || defined IS_IN_libpthread
 #  undef errno
 #  ifndef NOT_IN_libc
diff --git a/include/libc-internal.h b/include/libc-internal.h
index 525444ac8..33956d8b1 100644
--- a/include/libc-internal.h
+++ b/include/libc-internal.h
@@ -27,7 +27,7 @@
 # define attribute_relro
 #endif
 
-#ifdef __UCLIBC_HAS_THREADS_NATIVE__
+#ifdef __UCLIBC_HAS_TLS__
 # define attribute_tls_model_ie __attribute__ ((tls_model ("initial-exec")))
 #endif
 
diff --git a/include/link.h b/include/link.h
index 6ce15df5f..ec863c989 100644
--- a/include/link.h
+++ b/include/link.h
@@ -27,7 +27,7 @@
 #include <dlfcn.h>
 #endif
 #include <sys/types.h>
-#if defined _LIBC && defined __UCLIBC_HAS_THREADS_NATIVE__
+#if defined _LIBC && defined __UCLIBC_HAS_TLS__
 #include <tls.h>
 #endif
 
diff --git a/include/netdb.h b/include/netdb.h
index f750cd448..9d3807d3a 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -64,7 +64,7 @@ libc_hidden_proto(__h_errno_location)
 /* Macros for accessing h_errno from inside libc.  */
 #ifdef _LIBC
 # ifdef __UCLIBC_HAS_THREADS__
-#  if defined __UCLIBC_HAS_THREADS_NATIVE__ \
+#  if defined __UCLIBC_HAS_TLS__ \
              && (!defined NOT_IN_libc || defined IS_IN_libpthread)
 #   undef h_errno
 #   ifndef NOT_IN_libc
@@ -79,7 +79,7 @@ static inline int __set_h_errno (int __err)
 {
        return *__h_errno_location () = __err;
 }
-#  endif /* __UCLIBC_HAS_THREADS_NATIVE__ */
+#  endif /* __UCLIBC_HAS_TLS__ */
 # else
 #  undef h_errno
 #  define __set_h_errno(x) (h_errno = (x))
diff --git a/include/resolv.h b/include/resolv.h
index cdb14c713..184ef30c4 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -423,7 +423,7 @@ void		res_nclose (res_state) __THROW;
 __END_DECLS
 # if _LIBC
 #  ifdef __UCLIBC_HAS_THREADS__
-#   if defined __UCLIBC_HAS_THREADS_NATIVE__ \
+#   if defined __UCLIBC_HAS_TLS__ \
 	       && (!defined NOT_IN_libc || defined IS_IN_libpthread)
 #    undef _res
 #    ifndef NOT_IN_libc
@@ -435,7 +435,7 @@ extern __thread struct __res_state *__resp attribute_tls_model_ie;
 #   else
 #    undef _res
 #    define _res (*__resp)
-#   endif /* __UCLIBC_HAS_THREADS_NATIVE__ */
+#   endif /* __UCLIBC_HAS_TLS__ */
 #  endif /* __UCLIBC_HAS_THREADS__ */
 # endif /* _LIBC */
 #endif /* !_RESOLV_H_ */
diff --git a/ldso/include/ldso.h b/ldso/include/ldso.h
index 712ea0449..5d03f7656 100644
--- a/ldso/include/ldso.h
+++ b/ldso/include/ldso.h
@@ -37,7 +37,7 @@
 #include <dl-string.h>
 /* Now the ldso specific headers */
 #include <dl-elf.h>
-#ifdef __UCLIBC_HAS_THREADS_NATIVE__
+#ifdef __UCLIBC_HAS_TLS__
 /* Defines USE_TLS */
 #include <tls.h>
 #endif
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
index ecc7ce5cf..7544faaad 100644
--- a/libc/inet/resolv.c
+++ b/libc/inet/resolv.c
@@ -1269,7 +1269,7 @@ struct __res_state _res __attribute__((section (".bss")));
 #else
 struct __res_state _res __attribute__((section (".bss"))) attribute_hidden;
 
-# if defined __UCLIBC_HAS_THREADS_NATIVE__
+# if defined __UCLIBC_HAS_TLS__
 #  undef __resp
 __thread struct __res_state *__resp = &_res; 
 /*
@@ -1288,7 +1288,7 @@ struct __res_state *__resp = &_res;
 #endif
 
 #ifdef L_res_state
-# if defined __UCLIBC_HAS_THREADS_NATIVE__
+# if defined __UCLIBC_HAS_TLS__
 struct __res_state *
 __res_state (void)
 {
diff --git a/libc/misc/internals/errno.c b/libc/misc/internals/errno.c
index a89b5addf..e584f21f8 100644
--- a/libc/misc/internals/errno.c
+++ b/libc/misc/internals/errno.c
@@ -1,6 +1,6 @@
 #include <features.h>
 
-#ifdef __UCLIBC_HAS_THREADS_NATIVE__
+#ifdef __UCLIBC_HAS_TLS__
 __thread int errno;
 __thread int h_errno;