aboutsummaryrefslogtreecommitdiff
path: root/elf/dlopen.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-06-04 05:18:15 +0000
committerRoland McGrath <roland@gnu.org>1996-06-04 05:18:15 +0000
commitefec1d0c47a91d689e999913db62c50b5629d643 (patch)
tree2031b6d81092ae7119693e8adfdac4e6686485f8 /elf/dlopen.c
parentb25ae9c6a41d91a57379c223420b6b8a05940ff2 (diff)
downloadglibc-efec1d0c47a91d689e999913db62c50b5629d643.tar
glibc-efec1d0c47a91d689e999913db62c50b5629d643.tar.gz
glibc-efec1d0c47a91d689e999913db62c50b5629d643.tar.bz2
glibc-efec1d0c47a91d689e999913db62c50b5629d643.zip
Tue Jun 4 02:25:44 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* 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.
Diffstat (limited to 'elf/dlopen.c')
-rw-r--r--elf/dlopen.c31
1 files changed, 2 insertions, 29 deletions
diff --git a/elf/dlopen.c b/elf/dlopen.c
index 26ed35ace6..74ab8bb715 100644
--- a/elf/dlopen.c
+++ b/elf/dlopen.c
@@ -24,38 +24,11 @@ Cambridge, MA 02139, USA. */
void *
dlopen (const char *file, int mode)
{
- struct link_map *new, *l;
+ struct link_map *new;
void doit (void)
{
- Elf32_Addr init;
-
- new = _dl_map_object (_dl_loaded, file);
-
- /* Map in any dependencies. */
- for (l = new; l; l = l->l_next)
- if (! l->l_deps_loaded)
- {
- if (l->l_info[DT_NEEDED])
- {
- const char *strtab
- = (void *) l->l_addr + l->l_info[DT_STRTAB]->d_un.d_ptr;
- const Elf32_Dyn *d;
- for (d = l->l_ld; d->d_tag != DT_NULL; ++d)
- if (d->d_tag == DT_NEEDED)
- _dl_map_object (l, strtab + d->d_un.d_val);
- }
- l->l_deps_loaded = 1;
- }
-
- /* Relocate the objects loaded. */
- for (l = new; l; l = l->l_next)
- if (! l->l_relocated)
- _dl_relocate_object (l, mode == RTLD_LAZY);
-
- /* Run the initializer functions of new objects. */
- while (init = _dl_init_next ())
- (*(void (*) (void)) init) ();
+ new = _dl_open (_dl_loaded, file, mode);
}
return _dlerror_run (doit) ? NULL : new;