* elf/tst-tls14.c [USE_TLS && HAVE___THREAD]: Conditionalize on this.

	* elf/tst-tlsmod14a.c: Likewise.

	* sysdeps/unix/sysv/linux/sys/sysctl.h: Include <linux/compiler.h>
	before <linux/sysctl.h>.

diff --git a/ChangeLog b/ChangeLog
index 8cb8f94cebf0ea312bfa5c74507d562ad66fec98..6230ebefc69a86792040e521846fb0520c8a2a46 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-07-28  Roland McGrath  <roland@redhat.com>
+
+       * elf/tst-tls14.c [USE_TLS && HAVE___THREAD]: Conditionalize on this.
+       * elf/tst-tlsmod14a.c: Likewise.
+
+       * sysdeps/unix/sysv/linux/sys/sysctl.h: Include <linux/compiler.h>
+       before <linux/sysctl.h>.
+
 2003-07-27  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/unix/sysv/syscalls.list: time syscall never fails.

diff --git a/elf/tst-tls14.c b/elf/tst-tls14.c
index 4ae367a38f995aa3e90bcf8a9b816072037d3911..428fd5293eb8b455d5244309e18667576eb02bd6 100644 (file)
--- a/elf/tst-tls14.c
+++ b/elf/tst-tls14.c
@@ -4,6 +4,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <tls.h>
+
+#if USE_TLS && HAVE___THREAD
 
 #define AL 4096
 struct foo
@@ -53,4 +56,11 @@ do_test (void)
 }
 
 #define TEST_FUNCTION do_test ()
+
+#else
+
+#define TEST_FUNCTION 0
+
+#endif
+
 #include "../test-skeleton.c"

diff --git a/elf/tst-tlsmod14a.c b/elf/tst-tlsmod14a.c
index 4843e5937e939ac7c004b1f49c1468ae555542d3..0bb393d9c5d54c5cac446c34c824c2db25db9a01 100644 (file)
--- a/elf/tst-tlsmod14a.c
+++ b/elf/tst-tlsmod14a.c
@@ -1,6 +1,9 @@
 #include <stdint.h>
 #include <stdio.h>
 
+#include <tls.h>
+
+#if USE_TLS && HAVE___THREAD
 
 #define AL 4096
 struct foo
@@ -34,3 +37,5 @@ FCT (void)
 
   return result;
 }
+
+#endif