about summary refs log tree commit diff
path: root/csu/Versions
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-09-25 01:58:37 +0000
committerRoland McGrath <roland@gnu.org>2002-09-25 01:58:37 +0000
commit160bb4094514b41e70a4701235fb622c0061442b (patch)
tree3c176309b281310c577d02a235035534bffbb56f /csu/Versions
parent1e78de0594ad3963cb789ff82f9e50ec7c48fd9d (diff)
downloadglibc-160bb4094514b41e70a4701235fb622c0061442b.tar.gz
glibc-160bb4094514b41e70a4701235fb622c0061442b.tar.xz
glibc-160bb4094514b41e70a4701235fb622c0061442b.zip
* 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.
Diffstat (limited to 'csu/Versions')
-rw-r--r--csu/Versions16
1 files changed, 13 insertions, 3 deletions
diff --git a/csu/Versions b/csu/Versions
index 10c962d9ea..f0dfe91ca6 100644
--- 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
+  }
 }