efec1d0c47
* elf/linux-compat.c (_init): Pass reloc_addr arg to _dl_lookup_symbol. * elf/dl-lookup.c (_dl_lookup_symbol): Use l_searchlist. * elf/dl-deps.c: New file. * elf/Makefile (rtld-routines): Add dl-deps. * elf/link.h: Declare _dl_map_object_deps, _dl_open. * elf/rtld.c (dl_main): Use _dl_map_object_deps. * elf/dlopen.c: Use _dl_open. * elf/rtld.c (dl_main): Remove BEFORE_RTLD variable and list frobnication based on its value. Detach RTLD_MAP from the chain if its l_opencount is zero after loading deps. * elf/dlfcn.h (RTLD_BINDING_MASK): New macro. * elf/link.h (struct link_map): Replace l_deps_loaded flag member with `struct link_map **l_searchlist' and `unsigned int l_nsearchlist'. * elf/dl-lookup.c (_dl_lookup_symbol): Make SYMBOL_SCOPE arg an array of two link_map ptrs. Search the maps in the l_searchlist of each elt that is not null. * elf/dl-reloc.c (_dl_relocate_object): Pass proper SCOPE array. * elf/dl-runtime.c: Likewise. * elf/dlsym.c: Likewise. * elf/rtld.c (dl_main): Likewise. * elf/dl-minimal.c (realloc): Support realloc of the block most recently returned by the minimal malloc. * intl/localealias.c, intl/dcgettext.c [_LIBC]: Define HAVE_ALLOCA.
48 lines
1.5 KiB
C
48 lines
1.5 KiB
C
/* dlsym -- Look up a symbol in a shared object loaded by `dlopen'.
|
|
Copyright (C) 1995, 1996 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If
|
|
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
|
|
Cambridge, MA 02139, USA. */
|
|
|
|
#include <stddef.h>
|
|
#include <link.h>
|
|
#include <dlfcn.h>
|
|
#include <setjmp.h>
|
|
|
|
|
|
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);
|
|
}
|