diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-10-18 19:26:30 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-10-18 19:26:30 +0000 |
| commit | 609cf61467154868c88b1ede078322fb4b48a528 (patch) | |
| tree | 4034dfeb635a3f4fb133314a370f653578a7331a /elf/dl-runtime.c | |
| parent | 4a85a8ee31c357ce499529ca76136cce0b6773e9 (diff) | |
| download | glibc-609cf61467154868c88b1ede078322fb4b48a528.tar.gz glibc-609cf61467154868c88b1ede078322fb4b48a528.tar.xz glibc-609cf61467154868c88b1ede078322fb4b48a528.zip | |
[BZ #3313]
2006-10-17 Jakub Jelinek <jakub@redhat.com> * sunrpc/xdr_mem.c (xdrmem_setpos): Don't compare addresses as signed longs, check for x_base + pos overflow. * sunrpc/Makefile (tests): Add tst-xdrmem2. * sunrpc/tst-xdrmem2.c: New test. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * elf/dl-lookup.c (_dl_lookup_symbol_x): Add warning to _dl_lookup_symbol_x code. 2006-10-17 Jakub Jelinek <jakub@redhat.com> * elf/dl-runtime.c: Include sysdep-cancel.h. (_dl_fixup, _dl_profile_fixup): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-sym.c: Include sysdep-cancel.h. (do_sym): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-close.c: Include sysdep-cancel.h. (_dl_close): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-open.c: Include sysdep-cancel.h. (dl_open_worker): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. 2006-10-17 Jakub Jelinek <jakub@redhat.com> [BZ #3313] * malloc/malloc.c (malloc_consolidate): Set maxfb to address of last fastbin rather than end of fastbin array. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * sysdeps/i386/i486/bits/atomic.h (catomic_decrement): Use correct body macro. * sysdeps/x86_64/bits/atomic.h (__arch_c_compare_and_exchange_val_64_acq): Add missing casts. (catomic_decrement): Use correct body macro. 2006-10-17 Jakub Jelinek <jakub@redhat.com> * include/atomic.h: Add a unique prefix to all local variables in macros. * csu/tst-atomic.c (do_test): Test also catomic_* macros. * include/link.h: Include <rtld-lowlevel.h>. Define struct
Diffstat (limited to 'elf/dl-runtime.c')
| -rw-r--r-- | elf/dl-runtime.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c index 05fd974bf5..8bf5b89eb6 100644 --- a/elf/dl-runtime.c +++ b/elf/dl-runtime.c @@ -24,6 +24,7 @@ #include <unistd.h> #include <sys/param.h> #include <ldsodefs.h> +#include <sysdep-cancel.h> #include "dynamic-link.h" #if (!defined ELF_MACHINE_NO_RELA && !defined ELF_MACHINE_PLT_REL) \ @@ -93,11 +94,11 @@ _dl_fixup ( } struct r_scoperec *scoperec = l->l_scoperec; - if (l->l_type == lt_loaded) + if (l->l_type == lt_loaded && !SINGLE_THREAD_P) { __rtld_mrlock_lock (l->l_scoperec_lock); scoperec = l->l_scoperec; - catomic_increment (&scoperec->nusers); + atomic_increment (&scoperec->nusers); __rtld_mrlock_unlock (l->l_scoperec_lock); } @@ -106,8 +107,8 @@ _dl_fixup ( ELF_RTYPE_CLASS_PLT, DL_LOOKUP_ADD_DEPENDENCY, NULL); - if (l->l_type == lt_loaded - && catomic_decrement_val (&scoperec->nusers) == 0 + if (l->l_type == lt_loaded && !SINGLE_THREAD_P + && atomic_decrement_val (&scoperec->nusers) == 0 && __builtin_expect (scoperec->remove_after_use, 0)) { if (scoperec->notify) @@ -195,11 +196,11 @@ _dl_profile_fixup ( } struct r_scoperec *scoperec = l->l_scoperec; - if (l->l_type == lt_loaded) + if (l->l_type == lt_loaded && !SINGLE_THREAD_P) { __rtld_mrlock_lock (l->l_scoperec_lock); scoperec = l->l_scoperec; - catomic_increment (&scoperec->nusers); + atomic_increment (&scoperec->nusers); __rtld_mrlock_unlock (l->l_scoperec_lock); } @@ -208,8 +209,8 @@ _dl_profile_fixup ( ELF_RTYPE_CLASS_PLT, DL_LOOKUP_ADD_DEPENDENCY, NULL); - if (l->l_type == lt_loaded - && catomic_decrement_val (&scoperec->nusers) == 0 + if (l->l_type == lt_loaded && !SINGLE_THREAD_P + && atomic_decrement_val (&scoperec->nusers) == 0 && __builtin_expect (scoperec->remove_after_use, 0)) { if (scoperec->notify) |