diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Makerules | 3 | ||||
| -rw-r--r-- | elf/tst-thrlock.c | 8 | ||||
| -rw-r--r-- | tls.make.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 2f32dfdee5..554d8776e7 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 b0be86b368..200f8d7eea 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 71f1fbb35d..fe72eba141 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 d19e2e1792..6bcd2479c6 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 |