aboutsummaryrefslogtreecommitdiff
path: root/elf/dl-sym.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-03-07 05:26:02 +0000
committerUlrich Drepper <drepper@redhat.com>2004-03-07 05:26:02 +0000
commit021723ab784461de9eac57398ea16a47d4ab9366 (patch)
tree9fef57d701b88d5729e3150ea197f86957727998 /elf/dl-sym.c
parentbdf4a4f1eabb2e085b0610b53bb37b5263f4728d (diff)
downloadglibc-021723ab784461de9eac57398ea16a47d4ab9366.tar
glibc-021723ab784461de9eac57398ea16a47d4ab9366.tar.gz
glibc-021723ab784461de9eac57398ea16a47d4ab9366.tar.bz2
glibc-021723ab784461de9eac57398ea16a47d4ab9366.zip
Update.
2004-03-06 Ulrich Drepper <drepper@redhat.com> * elf/dl-lookup.c: We don't need for specialized lookup functions. Combining the functionality does not slow down relocation processing, it might even speed it up a little. * sysdeps/generic/ldsodefs.h: Adjust prototypes for lookup function. Add only one function pointer to rtlf_global_ro. * elf/do-lookup.h: Replace #ifs with ifs. * elf/dl-libc.c: Adjust _dl_lookup_* callers. * elf/dl-reloc.c: Likewise. * elf/dl-runtime.c: Likewise. * elf/dl-sym.c: Likewise. * elf/rtld.c: Likewise. Adjust _rtld_global_ro initialization. * sysdeps/generic/ldsodefs.h (__rtld_local_attribute__, __rtld_global_attribute__): Undef after use. (_rtld_local_ro): Define __rtld_local_attribute__ with just hidden if available. * sysdeps/alpha/Subdirs: New file. * sysdeps/alpha/soft-fp/Makefile: New file. * sysdeps/alpha/soft-fp/Versions: New file. * sysdeps/alpha/soft-fp/local-soft-fp.h: New file. * sysdeps/alpha/soft-fp/ots_add.c: New file. * sysdeps/alpha/soft-fp/ots_cmp.c: new file. * sysdeps/alpha/soft-fp/ots_cmpe.c: New file. * sysdeps/alpha/soft-fp/ots_cvtqux.c: New file. * sysdeps/alpha/soft-fp/ots_cvtqx.c: New file. * sysdeps/alpha/soft-fp/ots_cvttx.c: New file. * sysdeps/alpha/soft-fp/ots_cvtxq.c: New file. * sysdeps/alpha/soft-fp/ots_cvtxt.c: New file. * sysdeps/alpha/soft-fp/ots_div.c: New file. * sysdeps/alpha/soft-fp/ots_mul.c: New file. * sysdeps/alpha/soft-fp/ots_nintxq.c: New file. * sysdeps/alpha/soft-fp/ots_sub.c: New file.
Diffstat (limited to 'elf/dl-sym.c')
-rw-r--r--elf/dl-sym.c32
1 files changed, 15 insertions, 17 deletions
diff --git a/elf/dl-sym.c b/elf/dl-sym.c
index bee49f1fda..27f79a29e5 100644
--- a/elf/dl-sym.c
+++ b/elf/dl-sym.c
@@ -82,9 +82,9 @@ _dl_sym (void *handle, const char *name, void *who)
if (handle == RTLD_DEFAULT)
/* Search the global scope as seen in the caller object. */
- result = GLRO(dl_lookup_symbol) (name, match, &ref, match->l_scope, 0,
- DL_LOOKUP_RETURN_NEWEST
- | DL_LOOKUP_ADD_DEPENDENCY);
+ result = GLRO(dl_lookup_symbol_x) (name, match, &ref, match->l_scope, NULL,
+ 0, (DL_LOOKUP_RETURN_NEWEST
+ | DL_LOOKUP_ADD_DEPENDENCY), NULL);
else
{
if (handle != RTLD_NEXT)
@@ -92,9 +92,9 @@ _dl_sym (void *handle, const char *name, void *who)
/* Search the scope of the given object. */
struct link_map *map = handle;
- result = GLRO(dl_lookup_symbol) (name, match, &ref,
- map->l_local_scope, 0,
- DL_LOOKUP_RETURN_NEWEST);
+ result = GLRO(dl_lookup_symbol_x) (name, match, &ref,
+ map->l_local_scope, NULL, 0,
+ DL_LOOKUP_RETURN_NEWEST, NULL);
}
else
{
@@ -111,8 +111,8 @@ RTLD_NEXT used in code not dynamically loaded"));
while (l->l_loader != NULL)
l = l->l_loader;
- result = GLRO(dl_lookup_symbol_skip) (name, l, &ref,
- l->l_local_scope, match);
+ result = GLRO(dl_lookup_symbol_x) (name, l, &ref, l->l_local_scope,
+ NULL, 0, 0, match);
}
}
@@ -165,9 +165,9 @@ _dl_vsym (void *handle, const char *name, const char *version, void *who)
if (handle == RTLD_DEFAULT)
/* Search the global scope. */
- result = GLRO(dl_lookup_versioned_symbol) (name, match, &ref,
- match->l_scope, &vers, 0,
- DL_LOOKUP_ADD_DEPENDENCY);
+ result = GLRO(dl_lookup_symbol_x) (name, match, &ref, match->l_scope,
+ &vers, 0, DL_LOOKUP_ADD_DEPENDENCY,
+ NULL);
else if (handle == RTLD_NEXT)
{
if (__builtin_expect (match == GL(dl_loaded), 0))
@@ -183,17 +183,15 @@ RTLD_NEXT used in code not dynamically loaded"));
while (l->l_loader != NULL)
l = l->l_loader;
- result = GLRO(dl_lookup_versioned_symbol_skip) (name, l, &ref,
- l->l_local_scope,
- &vers, match);
+ result = GLRO(dl_lookup_symbol_x) (name, l, &ref, l->l_local_scope,
+ &vers, 0, 0, match);
}
else
{
/* Search the scope of the given object. */
struct link_map *map = handle;
- result = GLRO(dl_lookup_versioned_symbol) (name, map, &ref,
- map->l_local_scope, &vers,
- 0, 0);
+ result = GLRO(dl_lookup_symbol_x) (name, map, &ref, map->l_local_scope,
+ &vers, 0, 0, NULL);
}
if (ref != NULL)