svn commit: branches/uClibc-nptl: include ldso/include libc/inet libc/misc etc...

[carmelo at uclibc.org]

Author: carmelo
Date: 2009-02-20 13:36:21 +0000 (Fri, 20 Feb 2009)
New Revision: 25395

Log:
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 at st.com>


Modified:
   branches/uClibc-nptl/include/errno.h
   branches/uClibc-nptl/include/libc-internal.h
   branches/uClibc-nptl/include/link.h
   branches/uClibc-nptl/include/netdb.h
   branches/uClibc-nptl/include/resolv.h
   branches/uClibc-nptl/ldso/include/ldso.h
   branches/uClibc-nptl/libc/inet/resolv.c
   branches/uClibc-nptl/libc/misc/internals/errno.c


Changeset:
Modified: branches/uClibc-nptl/include/errno.h
===================================================================
--- branches/uClibc-nptl/include/errno.h	2009-02-20 13:32:13 UTC (rev 25394)
+++ branches/uClibc-nptl/include/errno.h	2009-02-20 13:36:21 UTC (rev 25395)
@@ -58,7 +58,7 @@
 
 __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

Modified: branches/uClibc-nptl/include/libc-internal.h
===================================================================
--- branches/uClibc-nptl/include/libc-internal.h	2009-02-20 13:32:13 UTC (rev 25394)
+++ branches/uClibc-nptl/include/libc-internal.h	2009-02-20 13:36:21 UTC (rev 25395)
@@ -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
 

Modified: branches/uClibc-nptl/include/link.h
===================================================================
--- branches/uClibc-nptl/include/link.h	2009-02-20 13:32:13 UTC (rev 25394)
+++ branches/uClibc-nptl/include/link.h	2009-02-20 13:36:21 UTC (rev 25395)
@@ -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
 

Modified: branches/uClibc-nptl/include/netdb.h
===================================================================
--- branches/uClibc-nptl/include/netdb.h	2009-02-20 13:32:13 UTC (rev 25394)
+++ branches/uClibc-nptl/include/netdb.h	2009-02-20 13:36:21 UTC (rev 25395)
@@ -64,7 +64,7 @@
 /* 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 @@
 {
        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))

Modified: branches/uClibc-nptl/include/resolv.h
===================================================================
--- branches/uClibc-nptl/include/resolv.h	2009-02-20 13:32:13 UTC (rev 25394)
+++ branches/uClibc-nptl/include/resolv.h	2009-02-20 13:36:21 UTC (rev 25395)
@@ -423,7 +423,7 @@
 __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 @@
 #   else
 #    undef _res
 #    define _res (*__resp)
-#   endif /* __UCLIBC_HAS_THREADS_NATIVE__ */
+#   endif /* __UCLIBC_HAS_TLS__ */
 #  endif /* __UCLIBC_HAS_THREADS__ */
 # endif /* _LIBC */
 #endif /* !_RESOLV_H_ */

Modified: branches/uClibc-nptl/ldso/include/ldso.h
===================================================================
--- branches/uClibc-nptl/ldso/include/ldso.h	2009-02-20 13:32:13 UTC (rev 25394)
+++ branches/uClibc-nptl/ldso/include/ldso.h	2009-02-20 13:36:21 UTC (rev 25395)
@@ -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

Modified: branches/uClibc-nptl/libc/inet/resolv.c
===================================================================
--- branches/uClibc-nptl/libc/inet/resolv.c	2009-02-20 13:32:13 UTC (rev 25394)
+++ branches/uClibc-nptl/libc/inet/resolv.c	2009-02-20 13:36:21 UTC (rev 25395)
@@ -1269,7 +1269,7 @@
 #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 @@
 #endif
 
 #ifdef L_res_state
-# if defined __UCLIBC_HAS_THREADS_NATIVE__
+# if defined __UCLIBC_HAS_TLS__
 struct __res_state *
 __res_state (void)
 {

Modified: branches/uClibc-nptl/libc/misc/internals/errno.c
===================================================================
--- branches/uClibc-nptl/libc/misc/internals/errno.c	2009-02-20 13:32:13 UTC (rev 25394)
+++ branches/uClibc-nptl/libc/misc/internals/errno.c	2009-02-20 13:36:21 UTC (rev 25395)
@@ -1,6 +1,6 @@
 #include <features.h>
 
-#ifdef __UCLIBC_HAS_THREADS_NATIVE__
+#ifdef __UCLIBC_HAS_TLS__
 __thread int errno;
 __thread int h_errno;