From 3045a1fe8969d56d1c2b1dbbe75a0a821b27c356 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Sun, 23 Mar 2003 11:17:28 +0000
Subject: [PATCH] * Makeconfig (+includes): Don't use $(last-includes).

---
 ChangeLog          |  4 ++++
 Makeconfig         |  2 +-
 nptl/ChangeLog     |  5 +++++
 nptl/tst-tls1.c    | 10 ++++++++++
 nptl/tst-tls2.c    | 11 ++++++++++-
 nptl/tst-tls3.c    |  8 ++++++++
 nptl/tst-tls3mod.c |  4 ++++
 7 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d295d84..c01d067 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-23  Roland McGrath  <roland@redhat.com>
+
+	* Makeconfig (+includes): Don't use $(last-includes).
+
 2003-03-22  Alexandre Oliva  <aoliva@redhat.com>
 
 	* sysdeps/unix/sysv/linux/configure.in: Update mips64 patterns.
diff --git a/Makeconfig b/Makeconfig
index b2c81e1..60d3519 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -621,7 +621,7 @@ endif	# $(+cflags) == ""
 +includes = -I$(..)include -I. \
 	    $(patsubst %/,-I%,$(objpfx)) $(patsubst %/,-I%,$(..)) \
 	    $(libio-include) $(includes) \
-	    $(+sysdep-includes) $(last-includes) $(sysincludes)
+	    $(+sysdep-includes) $(sysincludes)
 
 # Since libio has several internal header files, we use a -I instead
 # of many little headers in the include directory.
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index cf973dd..2c8c142 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,10 @@
 2003-03-23  Roland McGrath  <roland@redhat.com>
 
+	* tst-tls3.c (do_test) [! HAVE___THREAD]: Don't test anything.
+	* tst-tls3mod.c: Likewise.
+	* tst-tls1.c: Likewise.
+	* tst-tls2.c: Likewise.
+
 	* tst-mutex5.c (do_test): Unlock before destroy, otherwise we invoke
 	undefined behavior.
 
diff --git a/nptl/tst-tls1.c b/nptl/tst-tls1.c
index 86b3e6e..3668162 100644
--- a/nptl/tst-tls1.c
+++ b/nptl/tst-tls1.c
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 
 
+#if HAVE___THREAD
 struct test_s
 {
   int a;
@@ -51,11 +52,19 @@ tf (void *arg)
 
   return NULL;
 }
+#endif
 
 
 int
 do_test (void)
 {
+#if !HAVE___THREAD
+
+  puts ("No __thread support in compiler, test skipped.");
+
+  return 0;
+#else
+
   if (s.a != INIT_A || s.b != INIT_B)
     {
       puts ("initial value of s in main thread wrong");
@@ -85,6 +94,7 @@ do_test (void)
     }
 
   return 0;
+#endif
 }
 
 
diff --git a/nptl/tst-tls2.c b/nptl/tst-tls2.c
index 8b06926..1d8ea14 100644
--- a/nptl/tst-tls2.c
+++ b/nptl/tst-tls2.c
@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#if HAVE___THREAD
 
 #define N 10
 static pthread_t th[N];
@@ -105,11 +106,18 @@ tf (void *arg)
 
   return NULL;
 }
-
+#endif
 
 int
 do_test (void)
 {
+#if !HAVE___THREAD
+
+  puts ("No __thread support in compiler, test skipped.");
+
+  return 0;
+#else
+
   if (pthread_barrier_init (&b, NULL, N + 1) != 0)
     {
       puts ("barrier_init failed");
@@ -179,6 +187,7 @@ do_test (void)
       }
 
   return 0;
+#endif
 }
 
 
diff --git a/nptl/tst-tls3.c b/nptl/tst-tls3.c
index a34862e..4e7ca8e 100644
--- a/nptl/tst-tls3.c
+++ b/nptl/tst-tls3.c
@@ -72,6 +72,13 @@ int nsigs;
 int
 do_test (void)
 {
+#if !HAVE___THREAD
+
+  puts ("No __thread support in compiler, test skipped.");
+
+  return 0;
+#else
+
   if (pthread_barrier_init (&b, NULL, N + 1) != 0)
     {
       puts ("barrier_init failed");
@@ -172,6 +179,7 @@ do_test (void)
     }
 
   return 0;
+#endif
 }
 
 
diff --git a/nptl/tst-tls3mod.c b/nptl/tst-tls3mod.c
index 072b3f2..646f5b3 100644
--- a/nptl/tst-tls3mod.c
+++ b/nptl/tst-tls3mod.c
@@ -25,6 +25,8 @@
 #include <unistd.h>
 
 
+#if HAVE___THREAD
+
 extern pthread_barrier_t b;
 
 #define TOTAL_SIGS 1000
@@ -79,3 +81,5 @@ tf (void *arg)
 
   return NULL;
 }
+
+#endif
-- 
2.7.4