diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-08-08 07:43:03 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-08-08 07:43:03 +0000 |
| commit | 334fcf2a65f3b58867ce136da767c6c58a3d45ed (patch) | |
| tree | 36daebcd9bc1c447dc5bd04ac0e1b310214fa8e6 /linuxthreads/pthread.c | |
| parent | a30fb2df74710413014897f527bb565caf7cab9f (diff) | |
| download | glibc-334fcf2a65f3b58867ce136da767c6c58a3d45ed.zip glibc-334fcf2a65f3b58867ce136da767c6c58a3d45ed.tar.gz glibc-334fcf2a65f3b58867ce136da767c6c58a3d45ed.tar.bz2 | |
Update.
2003-08-07 Jakub Jelinek <jakub@redhat.com>
* sysdeps/generic/ldsodefs.h (_rtld_global): Add
_dl_rtld_lock_recursive and _dl_rtld_unlock_recursive.
* elf/rtld.c (rtld_lock_default_lock_recursive,
rtld_lock_default_unlock_recursive): New functions.
(dl_main): Initialize _dl_rtld_lock_recursive and
_dl_rtld_unlock_recursive.
2003-08-05 Jakub Jelinek <jakub@redhat.com>
* elf/ldconfig.c (main): Append SLIBDIR and LIBDIR to
config_file directories instead of prepending.
Diffstat (limited to 'linuxthreads/pthread.c')
| -rw-r--r-- | linuxthreads/pthread.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c index f708113..f261f8e 100644 --- a/linuxthreads/pthread.c +++ b/linuxthreads/pthread.c @@ -588,6 +588,15 @@ static void pthread_initialize(void) /* Transfer the old value from the dynamic linker's internal location. */ *__libc_dl_error_tsd () = *(*GL(dl_error_catch_tsd)) (); GL(dl_error_catch_tsd) = &__libc_dl_error_tsd; + + /* Make __rtld_lock_{,un}lock_recursive use pthread_mutex_{,un}lock, + keep the lock count from the ld.so implementation. */ + GL(dl_rtld_lock_recursive) = (void *) __pthread_mutex_lock; + GL(dl_rtld_unlock_recursive) = (void *) __pthread_mutex_unlock; + unsigned int rtld_lock_count = GL(dl_load_lock).mutex.__m_count; + GL(dl_load_lock).mutex.__m_count = 0; + while (rtld_lock_count-- > 0) + __pthread_mutex_lock (&GL(dl_load_lock).mutex); #endif #ifdef USE_TLS |