* elf/tst-tls12.c (main): Fix declaration.

	* elf/tst-tls10.c (dummy): Make hidden instead of static.
	* elf/tst-tlsmod7.c (dummy): Likewise.
	* elf/tst-tlsmod8.c (dummy): Likewise.
	* elf/tst-tlsmod9.c (dummy): Likewise.

2003-04-22  Roland McGrath  <roland@redhat.com>

	* sysdeps/unix/sysv/linux/not-cancel.h: Put parens around macro args.
	(open_not_cancel): Make last argument non-optional.
	* sysdeps/generic/check_fds.c (check_one_fd): Update caller.
	* sysdeps/unix/sysv/linux/gethostid.c (gethostid): Likewise.
	* iconv/gconv_cache.c (__gconv_load_cache): Likewise.

	* include/tls.h: Protect against multiple inclusion.

diff --git a/ChangeLog b/ChangeLog
index 4e993c524be801fc305f840a6f7c5ac3c51ca25c..769a54a62845fadb4f1de61d4505339f9c9a999b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2003-04-23  Jakub Jelinek  <jakub@redhat.com>
+
+       * elf/tst-tls12.c (main): Fix declaration.
+       * elf/tst-tls10.c (dummy): Make hidden instead of static.
+       * elf/tst-tlsmod7.c (dummy): Likewise.
+       * elf/tst-tlsmod8.c (dummy): Likewise.
+       * elf/tst-tlsmod9.c (dummy): Likewise.
+
+2003-04-22  Roland McGrath  <roland@redhat.com>
+
+       * sysdeps/unix/sysv/linux/not-cancel.h: Put parens around macro args.
+       (open_not_cancel): Make last argument non-optional.
+       * sysdeps/generic/check_fds.c (check_one_fd): Update caller.
+       * sysdeps/unix/sysv/linux/gethostid.c (gethostid): Likewise.
+       * iconv/gconv_cache.c (__gconv_load_cache): Likewise.
+
+       * include/tls.h: Protect against multiple inclusion.
+
 2003-04-22  Ulrich Drepper  <drepper@redhat.com>
 
        * nscd/nscd-client.h: Add declaration for __nscd_open_socket.

diff --git a/elf/tst-tls10.c b/elf/tst-tls10.c
index 75a535788a15da9cb948bb55047f5878001d4499..dbcc69727cb89ed8ae6abf07de97140a3bdefcc8 100644 (file)
--- a/elf/tst-tls10.c
+++ b/elf/tst-tls10.c
@@ -1,7 +1,7 @@
 #include "tst-tls10.h"
 
 #ifdef USE_TLS__THREAD
-static __thread int dummy = 12;
+__thread int dummy __attribute__((visibility ("hidden"))) = 12;
 __thread struct A local = { 1, 2, 3 };
 #endif
 

diff --git a/elf/tst-tls12.c b/elf/tst-tls12.c
index c73038b84f7da2547f1232c78632d6d3865db504..84aa7d35cac4aeebf702e14366740e6b9890fedc 100644 (file)
--- a/elf/tst-tls12.c
+++ b/elf/tst-tls12.c
@@ -5,7 +5,8 @@
   if (p->a != S || p->b != S + 1 || p->c != S + 2)     \
     abort ()
 
-int main()
+int
+main (void)
 {
 #ifdef USE_TLS__THREAD
   struct A *p;

diff --git a/elf/tst-tlsmod7.c b/elf/tst-tlsmod7.c
index 18f3befcbb4ab623c99cae35054ecf5aaa96c0c3..944b97f9c0c1f983b10fc026e1cba270d10d3df4 100644 (file)
--- a/elf/tst-tlsmod7.c
+++ b/elf/tst-tlsmod7.c
@@ -1,7 +1,7 @@
 #include "tst-tls10.h"
 
 #ifdef USE_TLS__THREAD
-static __thread int dummy = 12;
+__thread int dummy __attribute__((visibility ("hidden"))) = 12;
 __thread struct A a1 = { 4, 5, 6 };
 __thread struct A a2 = { 7, 8, 9 };
 __thread struct A a3 __attribute__((tls_model("initial-exec")))

diff --git a/elf/tst-tlsmod8.c b/elf/tst-tlsmod8.c
index 904c9b282c3a4d1fe9c35b6934c18ceb9fa6f9e1..c1822fc0cf1090c3597573114f5ed0babc6c8455 100644 (file)
--- a/elf/tst-tlsmod8.c
+++ b/elf/tst-tlsmod8.c
@@ -1,7 +1,7 @@
 #include "tst-tls10.h"
 
 #ifdef USE_TLS__THREAD
-static __thread long long dummy = 12;
+__thread long long dummy __attribute__((visibility ("hidden"))) = 12;
 __thread struct A a2 = { 22, 23, 24 };
 __thread struct A a4 __attribute__((tls_model("initial-exec")))
   = { 25, 26, 27 };

diff --git a/elf/tst-tlsmod9.c b/elf/tst-tlsmod9.c
index 7b138f5a0553a1829bbf5a5e73402bd600910acc..e124144e478814886ac9e94389b7ecda11fc1040 100644 (file)
--- a/elf/tst-tlsmod9.c
+++ b/elf/tst-tlsmod9.c
@@ -1,7 +1,7 @@
 #include "tst-tls10.h"
 
 #ifdef USE_TLS__THREAD
-static __thread int dummy = 12;
+__thread int dummy __attribute__((visibility ("hidden"))) = 12;
 __thread struct A a1 = { 4, 5, 6 };
 __thread struct A a3 __attribute__((tls_model("initial-exec")))
   = { 10, 11, 12 };

diff --git a/include/tls.h b/include/tls.h
index 2e20a45582ce3a41849d8853cadfb25f31fc1194..ffd3e4e70c812a6ef38f7fc10405a3eb057bc4a6 100644 (file)
--- a/include/tls.h
+++ b/include/tls.h
@@ -1,5 +1,8 @@
 /* This file defines USE___THREAD to 1 or 0 to cut down on the #if mess.  */
 
+#ifndef _include_tls_h
+#define _include_tls_h 1
+
 #include_next <tls.h>
 
 #if USE_TLS && HAVE___THREAD \
@@ -12,3 +15,5 @@
 # define USE___THREAD 0
 
 #endif
+
+#endif