From: Roland McGrath <roland@gnu.org>
Date: Mon, 28 Jul 2003 21:50:26 +0000 (+0000)
Subject: * elf/tst-tls14.c [USE_TLS && HAVE___THREAD]: Conditionalize on this.
X-Git-Tag: cvs/glibc-2_3_3~405
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=23195635ae74449727f8c07469b347bf884a37fa;p=thirdparty%2Fglibc.git

* 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 8cb8f94cebf..6230ebefc69 100644
--- 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 4ae367a38f9..428fd5293eb 100644
--- 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 4843e5937e9..0bb393d9c5d 100644
--- 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