From 3266531c78ce58455d2cc1d95e12b4148711bdf9 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 27 Oct 2006 23:26:20 +0000
Subject: [PATCH] * Makerules: USE_TLS support is now default.

	* tls.make.c: Likewise.
---
 ChangeLog         | 3 ++-
 Makerules         | 3 ---
 elf/tst-thrlock.c | 8 ++++++--
 tls.make.c        | 2 --
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f32dfde..554d877 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2006-10-27  Ulrich Drepper  <drepper@redhat.com>
 
-	* tls.make.c: USE_TLS support is now default.
+	* Makerules: USE_TLS support is now default.
+	* tls.make.c: Likewise.
 	* csu/Versions: Likewise.
 	* csu/libc-start.c: Likewise.
 	* csu/libc-tls.c: Likewise.
diff --git a/Makerules b/Makerules
index b0be86b..200f8d7 100644
--- a/Makerules
+++ b/Makerules
@@ -1233,10 +1233,7 @@ endif
 
 ifeq ($(firstword $(sysd-sorted-done) f)$(firstword $(generating) f),tf)
 -include $(common-objpfx)tls.make
-config-tls := notls
-ifeq ($(use-tls),yes)
 config-tls := tls
-endif
 ifeq ($(use-thread),yes)
 config-tls := thread
 endif
diff --git a/elf/tst-thrlock.c b/elf/tst-thrlock.c
index 71f1fbb..fe72eba 100644
--- a/elf/tst-thrlock.c
+++ b/elf/tst-thrlock.c
@@ -27,8 +27,9 @@ tf (void *arg)
   return NULL;
 }
 
-int
-main (void)
+
+static int
+do_test (void)
 {
 #define N 10
   pthread_t th[N];
@@ -53,3 +54,6 @@ main (void)
     }
   return 0;
 }
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
diff --git a/tls.make.c b/tls.make.c
index d19e2e1..6bcd247 100644
--- a/tls.make.c
+++ b/tls.make.c
@@ -2,8 +2,6 @@
 
 #include <tls.h>
 
-@@@ use-tls = yes @@@
-
 #if USE___THREAD
 @@@ use-thread = yes @@@
 #else
-- 
2.7.4