aboutsummaryrefslogtreecommitdiff
path: root/elf/dl-sym.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-08-26 23:41:19 +0000
committerUlrich Drepper <drepper@redhat.com>2000-08-26 23:41:19 +0000
commit2b7238dda8a0675577701d59f655029c55c60bfe (patch)
tree1c3bd9a230657021690ce38bfff4bbb42164f209 /elf/dl-sym.c
parent36466e64f0f8cbf1a915070f3f071b9360926cae (diff)
downloadglibc-2b7238dda8a0675577701d59f655029c55c60bfe.zip
glibc-2b7238dda8a0675577701d59f655029c55c60bfe.tar.gz
glibc-2b7238dda8a0675577701d59f655029c55c60bfe.tar.bz2
Update.
2000-08-26 Ulrich Drepper <drepper@redhat.com> * elf/Makefile (distribute): Add unloadmod.c, reldepmod1.c, reldepmod2.c, reldepmod3.c, and reldepmod4.c. (tests): Add unload, reldep, reldep2, and reldep3. (modules-names): Add unloadmod, reldepmod1, reldepmod2, reldepmod3, and reldepmod4. Add rules to build and run unload, reldep, reldep2, and reldep3. * elf/dl-lookup.c (_dl_lookup_symbol): Add new parameter explicit. Don't create relocation dependency if it is nonzero. (_dl_lookup_symbol_skip): Remove relocation dependency stuff. This can never happen here. (_dl_lookup_versioned_symbol): Add new parameter explicit. Don't create relocation dependency if it is nonzero. (_dl_lookup_versioned_symbol_skip): Remove relocation dependency stuff. This can never happen here. * sysdeps/generic/ldsodefs.h: Change prototypes. * elf/dl-reloc.c (RESOLVE_MAP): Pass 0 in explicit parameter to _dl_lookup_up and _dl_lookup_versioned_symbol. (RESOLV): Likewise. * elf/dl-runtime.c (fixup): Likewise. (profile_fixup): Likewise. * elf/dl-libc.c (do_dlsym): Pass 1 in explicit parameter to _dl_lookup_symbol. * elf/dl-symbol.c (_dl_symbol_value): Likewise. * elf/rtld.c (dl_main): Likewise. * elf/dl-sym.c (_dl_sym): Pass 1 in explicit parameter to _dl_lookup_symbol if handle is not RTLD_DEFAULT. Always compute and pass down the caller map. (_dl_vsym): Likewise. * elf/reldep.c: New file. * elf/reldep2.c: New file. * elf/reldep3.c: New file. * elf/reldepmod1.c: New file. * elf/reldepmod2.c: New file. * elf/reldepmod3.c: New file. * elf/reldepmod4.c: New file. * elf/unload.c: New file. * elf/unloadmod.c: New file. * elf/do-lookup.h: Remove unused undef_name parameter. * elf/dl-lookup.c: Adjust callers.
Diffstat (limited to 'elf/dl-sym.c')
-rw-r--r--elf/dl-sym.c48
1 files changed, 23 insertions, 25 deletions
diff --git a/elf/dl-sym.c b/elf/dl-sym.c
index e54ed80..8738656 100644
--- a/elf/dl-sym.c
+++ b/elf/dl-sym.c
@@ -31,22 +31,21 @@ _dl_sym (void *handle, const char *name, void *who)
{
const ElfW(Sym) *ref = NULL;
lookup_t result;
+ ElfW(Addr) caller = (ElfW(Addr)) who;
+ struct link_map *match;
+ struct link_map *l;
+
+ /* Find the highest-addressed object that CALLER is not below. */
+ match = NULL;
+ for (l = _dl_loaded; l; l = l->l_next)
+ if (caller >= l->l_addr && (!match || match->l_addr < l->l_addr))
+ match = l;
if (handle == RTLD_DEFAULT)
/* Search the global scope. */
- result = _dl_lookup_symbol (name, NULL, &ref, _dl_global_scope, 0);
+ result = _dl_lookup_symbol (name, match, &ref, _dl_global_scope, 0, 0);
else
{
- struct link_map *l;
- struct link_map *match;
- ElfW(Addr) caller = (ElfW(Addr)) who;
-
- /* Find the highest-addressed object that CALLER is not below. */
- match = NULL;
- for (l = _dl_loaded; l; l = l->l_next)
- if (caller >= l->l_addr && (!match || match->l_addr < l->l_addr))
- match = l;
-
if (handle != RTLD_NEXT)
{
/* Search the scope of the given object. */
@@ -58,7 +57,7 @@ _dl_sym (void *handle, const char *name, void *who)
match = _dl_loaded;
result = _dl_lookup_symbol (name, match, &ref, map->l_local_scope,
- 0);
+ 0, 1);
}
else
{
@@ -88,6 +87,9 @@ _dl_vsym (void *handle, const char *name, const char *version, void *who)
const ElfW(Sym) *ref = NULL;
struct r_found_version vers;
lookup_t result;
+ ElfW(Addr) caller = (ElfW(Addr)) who;
+ struct link_map *match;
+ struct link_map *l;
/* Compute hash value to the version string. */
vers.name = version;
@@ -96,22 +98,18 @@ _dl_vsym (void *handle, const char *name, const char *version, void *who)
/* We don't have a specific file where the symbol can be found. */
vers.filename = NULL;
+ /* Find the highest-addressed object that CALLER is not below. */
+ match = NULL;
+ for (l = _dl_loaded; l; l = l->l_next)
+ if (caller >= l->l_addr && (!match || match->l_addr < l->l_addr))
+ match = l;
+
if (handle == RTLD_DEFAULT)
/* Search the global scope. */
- result = _dl_lookup_versioned_symbol (name, NULL, &ref, _dl_global_scope,
- &vers, 0);
+ result = _dl_lookup_versioned_symbol (name, match, &ref, _dl_global_scope,
+ &vers, 0, 0);
else if (handle == RTLD_NEXT)
{
- struct link_map *l;
- struct link_map *match;
- ElfW(Addr) caller = (ElfW(Addr)) who;
-
- /* Find the highest-addressed object that CALLER is not below. */
- match = NULL;
- for (l = _dl_loaded; l; l = l->l_next)
- if (caller >= l->l_addr && (!match || match->l_addr < l->l_addr))
- match = l;
-
if (! match)
_dl_signal_error (0, NULL, N_("\
RTLD_NEXT used in code not dynamically loaded"));
@@ -129,7 +127,7 @@ RTLD_NEXT used in code not dynamically loaded"));
/* Search the scope of the given object. */
struct link_map *map = handle;
result = _dl_lookup_versioned_symbol (name, map, &ref,
- map->l_local_scope, &vers, 0);
+ map->l_local_scope, &vers, 0, 1);
}
if (ref)