aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2003-07-28 21:50:26 +0000
committerRoland McGrath <roland@gnu.org>2003-07-28 21:50:26 +0000
commit23195635ae74449727f8c07469b347bf884a37fa (patch)
treed28e40206ffbbdca68592d09e88824a9653b4861
parentcbb91e21b41fd79950512674de7c76fd24562764 (diff)
downloadglibc-23195635ae74449727f8c07469b347bf884a37fa.zip
glibc-23195635ae74449727f8c07469b347bf884a37fa.tar.gz
glibc-23195635ae74449727f8c07469b347bf884a37fa.tar.bz2
* 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>.
-rw-r--r--ChangeLog8
-rw-r--r--elf/tst-tls14.c10
-rw-r--r--elf/tst-tlsmod14a.c5
3 files changed, 23 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8cb8f94..6230ebe 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 4ae367a..428fd52 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 4843e59..0bb393d 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