summaryrefslogtreecommitdiff
path: root/elf/dl-sym.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-07-23 22:58:50 +0000
committerUlrich Drepper <drepper@redhat.com>1999-07-23 22:58:50 +0000
commit06535ae9487708dad9048552c9c92828d998a897 (patch)
tree644ca3f36a0aca375c41e6bdded2d3904b8821e9 /elf/dl-sym.c
parentfc9cfb28c05def1bfc0edc099d8001f83654fd10 (diff)
Update.
* posix/unistd.h: Move declaration of __libc_enable_secure to... * include/unistd.h: ...here. * elf/dl-open.c (dl_open_worker): If DST is used in SUID program punt. * elf/dl-deps.c (expand_dst): Likewise. * elf/dynamic-link.h: Set DT_SYMBOLIC, DT_TEXTREL, and DT_BIND_NOW based on DT_FLAGS value. * elf/do-lookup.h: Remove reference_name parameter, add undef_map. Add test for symbols marked STV_HIDDEN. * elf/dl-lookup.c (_dl_lookup_symbol): Remove reference_name parameter, add undef_map. Compute reference_name locally. Update call to do_lookup. (_dl_lookup_symbol_skip): Likewise. (_dl_lookup_versioned_symbol): Likewise. (_dl_lookup_versioned_symbol_skip): Likewise. * elf/dl-libc.c: Update call to _dl_lookup_*symbol. * elf/dl-runtime.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-symbol.c: Likewise. * elf/ldsodefs.h: Adjust prototypes. * elf/dl-reloc.c (RESOLV): Add test for STV_PROTECTED flag set and handle appropriately. Add comment about DT_TEXTREL. * elf/dl-runtime.c: Likewise.
Diffstat (limited to 'elf/dl-sym.c')
-rw-r--r--elf/dl-sym.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/elf/dl-sym.c b/elf/dl-sym.c
index 441b54fe45..91ca1277df 100644
--- a/elf/dl-sym.c
+++ b/elf/dl-sym.c
@@ -34,7 +34,7 @@ _dl_sym (void *handle, const char *name, void *who)
if (handle == RTLD_DEFAULT)
/* Search the global scope. */
- loadbase = _dl_lookup_symbol (name, &ref, _dl_global_scope, NULL, 0);
+ loadbase = _dl_lookup_symbol (name, NULL, &ref, _dl_global_scope, 0);
else if (handle == RTLD_NEXT)
{
struct link_map *l, *match;
@@ -54,15 +54,14 @@ RTLD_NEXT used in code not dynamically loaded"));
while (l->l_loader)
l = l->l_loader;
- loadbase = _dl_lookup_symbol_skip (name, &ref, l->l_local_scope,
- NULL, match);
+ loadbase = _dl_lookup_symbol_skip (name, l, &ref, l->l_local_scope,
+ match);
}
else
{
/* Search the scope of the given object. */
struct link_map *map = handle;
- loadbase = _dl_lookup_symbol (name, &ref, map->l_local_scope,
- map->l_name, 0);
+ loadbase = _dl_lookup_symbol (name, map, &ref, map->l_local_scope, 0);
}
if (loadbase)
@@ -88,8 +87,8 @@ _dl_vsym (void *handle, const char *name, const char *version, void *who)
if (handle == RTLD_DEFAULT)
/* Search the global scope. */
- loadbase = _dl_lookup_versioned_symbol (name, &ref, _dl_global_scope,
- NULL, &vers, 0);
+ loadbase = _dl_lookup_versioned_symbol (name, NULL, &ref, _dl_global_scope,
+ &vers, 0);
else if (handle == RTLD_NEXT)
{
struct link_map *l, *match;
@@ -109,17 +108,16 @@ RTLD_NEXT used in code not dynamically loaded"));
while (l->l_loader)
l = l->l_loader;
- loadbase = _dl_lookup_versioned_symbol_skip (name, &ref,
+ loadbase = _dl_lookup_versioned_symbol_skip (name, l, &ref,
l->l_local_scope,
- NULL, &vers, match);
+ &vers, match);
}
else
{
/* Search the scope of the given object. */
struct link_map *map = handle;
- loadbase = _dl_lookup_versioned_symbol (name, &ref,
- map->l_local_scope,
- map->l_name, &vers, 0);
+ loadbase = _dl_lookup_versioned_symbol (name, map, &ref,
+ map->l_local_scope, &vers, 0);
}
if (loadbase)