From 160bb4094514b41e70a4701235fb622c0061442b Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Wed, 25 Sep 2002 01:58:37 +0000
Subject: * 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.

	* elf/tls-macros.h [__x86_64__] (TLS_LE, TLS_IE, TLS_LD, TLS_GD):
	New macros for x86-64.

	* sysdeps/unix/sysv/linux/alpha/bits/time.h: File removed.
	It was indentical to the linux/bits/time.h file.

	* nscd/nscd_gethst_r.c (nscd_gethst_r): Add a cast to silence warning.

	* resolv/gethnamaddr.c (gethostbyaddr): Use socklen_t for SIZE.
---
 resolv/Versions | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'resolv/Versions')

diff --git a/resolv/Versions b/resolv/Versions
index 668f643..ab6a386 100644
--- 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;
   }
-- 
cgit v1.1