aboutsummaryrefslogtreecommitdiff
path: root/elf/dl-runtime.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-10-27 15:54:20 +0000
committerUlrich Drepper <drepper@redhat.com>2006-10-27 15:54:20 +0000
commitc0a777e8d01ab40dd9c0ce95328430a4ce7299e3 (patch)
treecf716a0ed441fb850dd3ec3774aa6eebeac4d95b /elf/dl-runtime.c
parentee96ce2fca39c9660a7efccb708f4ad876b24883 (diff)
downloadglibc-c0a777e8d01ab40dd9c0ce95328430a4ce7299e3.tar
glibc-c0a777e8d01ab40dd9c0ce95328430a4ce7299e3.tar.gz
glibc-c0a777e8d01ab40dd9c0ce95328430a4ce7299e3.tar.bz2
glibc-c0a777e8d01ab40dd9c0ce95328430a4ce7299e3.zip
* elf/dl-lookup.c (_dl_debug_bindings): Remove unised symbol_scope
argument. (_dl_lookup_symbol_x): Adjust caller. * sysdeps/generic/ldsodefs.h (struct link_namespaces): Remove _ns_global_scope. * elf/rtld.c (dl_main): Don't initialize _ns_global_scope. * elf/dl-libc.c: Revert l_scope name changes. * elf/dl-load.c: Likewise. * elf/dl-object.c: Likewise. * elf/rtld.c: Likewise. * elf/dl-close.c (_dl_close): Likewise. * elf/dl-open.c (dl_open_worker): Likewise. If not SINGLE_THREAD_P, always use __rtld_mrlock_{change,done}. Always free old scope list here if not l_scope_mem. * elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Revert l_scope name change. Never free scope list here. Just __rtld_mrlock_lock before the lookup and __rtld_mrlock_unlock it after the lookup. * elf/dl-sym.c: Likewise. * include/link.h (struct r_scoperec): Remove. (struct link_map): Replace l_scoperec with l_scope, l_scoperec_mem with l_scope_mem and l_scoperec_lock with l_scope_lock.
Diffstat (limited to 'elf/dl-runtime.c')
-rw-r--r--elf/dl-runtime.c43
1 files changed, 8 insertions, 35 deletions
diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c
index 8bf5b89eb6..0488fab8d0 100644
--- a/elf/dl-runtime.c
+++ b/elf/dl-runtime.c
@@ -93,29 +93,15 @@ _dl_fixup (
version = NULL;
}
- struct r_scoperec *scoperec = l->l_scoperec;
if (l->l_type == lt_loaded && !SINGLE_THREAD_P)
- {
- __rtld_mrlock_lock (l->l_scoperec_lock);
- scoperec = l->l_scoperec;
- atomic_increment (&scoperec->nusers);
- __rtld_mrlock_unlock (l->l_scoperec_lock);
- }
+ __rtld_mrlock_lock (l->l_scope_lock);
result = _dl_lookup_symbol_x (strtab + sym->st_name, l, &sym,
- scoperec->scope, version,
- ELF_RTYPE_CLASS_PLT,
+ l->l_scope, version, ELF_RTYPE_CLASS_PLT,
DL_LOOKUP_ADD_DEPENDENCY, NULL);
- 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)
- __rtld_notify (scoperec->nusers);
- else
- free (scoperec);
- }
+ if (l->l_type == lt_loaded && !SINGLE_THREAD_P)
+ __rtld_mrlock_unlock (l->l_scope_lock);
/* Currently result contains the base load address (or link map)
of the object that defines sym. Now add in the symbol
@@ -195,29 +181,16 @@ _dl_profile_fixup (
version = NULL;
}
- struct r_scoperec *scoperec = l->l_scoperec;
if (l->l_type == lt_loaded && !SINGLE_THREAD_P)
- {
- __rtld_mrlock_lock (l->l_scoperec_lock);
- scoperec = l->l_scoperec;
- atomic_increment (&scoperec->nusers);
- __rtld_mrlock_unlock (l->l_scoperec_lock);
- }
+ __rtld_mrlock_lock (l->l_scope_lock);
result = _dl_lookup_symbol_x (strtab + refsym->st_name, l, &defsym,
- scoperec->scope, version,
+ l->l_scope, version,
ELF_RTYPE_CLASS_PLT,
DL_LOOKUP_ADD_DEPENDENCY, NULL);
- 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)
- __rtld_notify (scoperec->nusers);
- else
- free (scoperec);
- }
+ if (l->l_type == lt_loaded && !SINGLE_THREAD_P)
+ __rtld_mrlock_unlock (l->l_scope_lock);
/* Currently result contains the base load address (or link map)
of the object that defines sym. Now add in the symbol