2002-09-24 Roland McGrath <roland@redhat.com>

	* csu/Versions: Use %include <tls.h> to get USE_TLS defined.
	(libc: GLIBC_2.0) [USE_TLS && HAVE___THREAD]: Remove _errno, errno.
	(libc: GLIBC_2.3) [USE_TLS && HAVE___THREAD]: Put errno here instead.
	* resolv/Versions: Use %include <tls.h> to get USE_TLS defined.
	(libc: GLIBC_2.0) [USE_TLS && HAVE___THREAD]: Remove _h_errno, h_errno,
	and _res.
	(libc: GLIBC_2.3) [USE_TLS && HAVE___THREAD]: Put h_errno, _res here.

diff --git a/csu/Versions b/csu/Versions
index 10c962d..f0dfe91 100644 (file)
--- a/csu/Versions
+++ b/csu/Versions
@@ -1,16 +1,26 @@
+%include <tls.h>
+
 libc {
   GLIBC_2.0 {
-    # global variables
-    _errno;
-
     # helper functions
     __libc_init_first; __libc_start_main;
 
+%if !(USE_TLS && HAVE___THREAD)
+    # global variables
+    _errno;
+
     # variables in normal name space
     errno;
+%endif
   }
   GLIBC_2.1 {
     # New special glibc functions.
     gnu_get_libc_release; gnu_get_libc_version;
   }
+  GLIBC_2.3 {
+%if USE_TLS && HAVE___THREAD
+    # This version is for the TLS symbol, GLIBC_2.0 is the old object symbol.
+    errno;
+%endif
+  }
 }

diff --git a/resolv/Versions b/resolv/Versions
index 668f643..ab6a386 100644 (file)
--- a/resolv/Versions
+++ b/resolv/Versions
@@ -1,7 +1,11 @@
+%include <tls.h>
+
 libc {
   GLIBC_2.0 {
+%if !(USE_TLS && HAVE___THREAD)
     # global variables
     _h_errno; _res;
+%endif
 
     # helper functions
     __h_errno_location;
@@ -10,7 +14,10 @@ libc {
     __res_randomid;
 
     # variables in normal name space
-    h_errlist; h_errno; h_nerr;
+    h_errlist; h_nerr;
+%if !(USE_TLS && HAVE___THREAD)
+    h_errno;
+%endif
 
     # h*
     herror; hstrerror;
@@ -22,6 +29,12 @@ libc {
     # r*
     __res_state; __res_init; __res_nclose; __res_ninit; _res_hconf;
   }
+  GLIBC_2.3 {
+%if USE_TLS && HAVE___THREAD
+    # This version is for the TLS symbol, GLIBC_2.0 is the old object symbol.
+    h_errno; _res;
+%endif
+  }
   GLIBC_PRIVATE {
     __gai_sigqueue;
   }