From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 21 May 2007 22:29:51 +0000 (+0000)
Subject: (pthread_functions): Don't add .ptr_wait_lookup_done here. (__pthread_initialize_mini... 
X-Git-Tag: cvs/glibc-2_6_1~79
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7adefea85d3fcd88e60638d18a022b6968b9b891;p=thirdparty%2Fglibc.git

(pthread_functions): Don't add .ptr_wait_lookup_done here. (__pthread_initialize_minimal_internal): Initialize _dl_wait_lookup_done pointer in _rtld_global directly.
---

diff --git a/nptl/init.c b/nptl/init.c
index fb4030e2490..f67467aa5a6 100644
--- a/nptl/init.c
+++ b/nptl/init.c
@@ -117,8 +117,7 @@ static const struct pthread_functions pthread_functions =
     .ptr__nptl_deallocate_tsd = __nptl_deallocate_tsd,
     .ptr__nptl_setxid = __nptl_setxid,
     /* For now only the stack cache needs to be freed.  */
-    .ptr_freeres = __free_stack_cache,
-    .ptr_wait_lookup_done = __wait_lookup_done
+    .ptr_freeres = __free_stack_cache
   };
 # define ptr_pthread_functions &pthread_functions
 #else
@@ -366,6 +365,8 @@ __pthread_initialize_minimal_internal (void)
 
   GL(dl_init_static_tls) = &__pthread_init_static_tls;
 
+  GL(dl_wait_lookup_done) = &__wait_lookup_done;
+
   /* Register the fork generation counter with the libc.  */
 #ifndef TLS_MULTIPLE_THREADS_IN_TCB
   __libc_multiple_threads_ptr =