From 6d59823c29df228415836f289e62064f95849e71 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 21 May 2007 22:38:06 +0000 Subject: * sysdeps/x86_64/cacheinfo.c (init_cacheinfo): Pass correct value as second parameter to handle_intel. --- nptl/ChangeLog | 12 ++++++++++++ nptl/sysdeps/pthread/pthread-functions.h | 1 - nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c | 6 ------ nptl/sysdeps/x86_64/tls.h | 5 +---- 4 files changed, 13 insertions(+), 11 deletions(-) (limited to 'nptl') diff --git a/nptl/ChangeLog b/nptl/ChangeLog index ed00f55..2d4f50b 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,15 @@ +2007-05-21 Ulrich Drepper + + * sysdeps/pthread/pthread-functions.h (struct pthread_functions): + Remove ptr_wait_lookup_done again. + * init.c (pthread_functions): Don't add .ptr_wait_lookup_done here. + (__pthread_initialize_minimal_internal): Initialize + _dl_wait_lookup_done pointer in _rtld_global directly. + * sysdeps/unix/sysv/linux/libc_pthread_init.c (__libc_pthread_init): + Remove code to code _dl_wait_lookup_done. + * sysdeps/x86_64/tls.h (THREAD_GSCOPE_WAIT): The pointer is not + encrypted for now. + 2007-05-21 Jakub Jelinek * tst-robust9.c (do_test): Don't fail if ENABLE_PI and diff --git a/nptl/sysdeps/pthread/pthread-functions.h b/nptl/sysdeps/pthread/pthread-functions.h index f0eddd3..0c404fc 100644 --- a/nptl/sysdeps/pthread/pthread-functions.h +++ b/nptl/sysdeps/pthread/pthread-functions.h @@ -97,7 +97,6 @@ struct pthread_functions void (*ptr__nptl_deallocate_tsd) (void); int (*ptr__nptl_setxid) (struct xid_command *); void (*ptr_freeres) (void); - void (*ptr_wait_lookup_done) (void); }; /* Variable in libc.so. */ diff --git a/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c b/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c index 25509eb..4b614bd 100644 --- a/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c +++ b/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c @@ -71,12 +71,6 @@ __libc_pthread_init (ptr, reclaim, functions) dest->parr[cnt] = p; } __libc_pthread_functions_init = 1; - -# ifdef RTLD_NOT_MANGLED - GL(dl_wait_lookup_done) = functions->ptr_wait_lookup_done; -# else - GL(dl_wait_lookup_done) = __libc_pthread_functions.ptr_wait_lookup_done; -# endif #endif #ifndef TLS_MULTIPLE_THREADS_IN_TCB diff --git a/nptl/sysdeps/x86_64/tls.h b/nptl/sysdeps/x86_64/tls.h index 00c9abb..3a69e04 100644 --- a/nptl/sysdeps/x86_64/tls.h +++ b/nptl/sysdeps/x86_64/tls.h @@ -357,10 +357,7 @@ typedef struct #define THREAD_GSCOPE_SET_FLAG() \ THREAD_SETMEM (THREAD_SELF, header.gscope_flag, THREAD_GSCOPE_FLAG_USED) #define THREAD_GSCOPE_WAIT() \ - do { void (*ptr) (void) = GL(dl_wait_lookup_done); \ - PTR_DEMANGLE (ptr); \ - ptr (); \ - } while (0) + GL(dl_wait_lookup_done) () #endif /* __ASSEMBLER__ */ -- cgit v1.1