aboutsummaryrefslogtreecommitdiff
path: root/elf/dlsym.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-06-04 23:06:02 +0000
committerRoland McGrath <roland@gnu.org>1996-06-04 23:06:02 +0000
commitf68b86cc7bdcee246296d49f3a3318c1b97693f0 (patch)
tree34a9e7bde9fd4f15d76192869b800ff7ff461874 /elf/dlsym.c
parent14d898aef6373abaf64a7b17f32e8ce3f655cdf3 (diff)
downloadglibc-f68b86cc7bdcee246296d49f3a3318c1b97693f0.tar
glibc-f68b86cc7bdcee246296d49f3a3318c1b97693f0.tar.gz
glibc-f68b86cc7bdcee246296d49f3a3318c1b97693f0.tar.bz2
glibc-f68b86cc7bdcee246296d49f3a3318c1b97693f0.zip
Tue Jun 4 18:57:57 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* elf/dladdr.c: Remove #include <setjmp.h>, we don't use it. * shlib-versions: Set libdl=2. * elf/dl-deps.c (_dl_map_object_deps): Use a linked list of alloca'd elements and then scan it to fill the single malloc'd array, instead of using realloc to grow the array in the first pass. _dl_map_object may do some mallocs that break our stream of reallocs, and the minimal realloc can't handle that. * elf/dl-init.c (_dl_init_next): Take argument, link_map whose searchlist describes the piece of the DT_NEEDED graph to be initialized. * elf/link.h: Update prototype. * sysdeps/i386/dl-machine.h (RTLD_START): Pass _dl_loaded as argument to _dl_init_next. * sysdeps/m68k/dl-machine.h: Likewise. * elf/dl-deps.c (_dl_open): Pass new object as arg to _dl_init_next. * elf/link.h (struct link_map): Add `l_reserved' member, soaking up extra bits in last byte. * elf/dl-deps.c (_dl_map_object_deps): Use that for mark bit to avoid putting dup elts in search list. * elf/dlclose.c: Use MAP->l_searchlist to find deps to close. * elf/dlsym.c: Don't tweak linked list. Scope array given to _dl_lookup_symbol does the right thing. Tue Jun 4 02:25:44 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
Diffstat (limited to 'elf/dlsym.c')
-rw-r--r--elf/dlsym.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/elf/dlsym.c b/elf/dlsym.c
index 804d404bb3..f874af780a 100644
--- a/elf/dlsym.c
+++ b/elf/dlsym.c
@@ -27,21 +27,13 @@ void *
dlsym (void *handle, const char *name)
{
struct link_map *map = handle;
- struct link_map *real_next;
Elf32_Addr loadbase;
const Elf32_Sym *ref = NULL;
- int lose;
void doit (void)
{
struct link_map *scope[2] = { map, NULL };
loadbase = _dl_lookup_symbol (name, &ref, scope, map->l_name, 0, 0);
}
- /* Confine the symbol scope to just this map. */
- real_next = map->l_next;
- map->l_next = NULL;
- lose = _dlerror_run (doit);
- map->l_next = real_next;
-
- return lose ? NULL : (void *) (loadbase + ref->st_value);
+ return _dlerror_run (doit) ? NULL : (void *) (loadbase + ref->st_value);
}