From efec1d0c47a91d689e999913db62c50b5629d643 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 4 Jun 1996 05:18:15 +0000 Subject: Tue Jun 4 02:25:44 1996 Roland McGrath * 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. --- elf/link.h | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) (limited to 'elf/link.h') diff --git a/elf/link.h b/elf/link.h index a19a2ce..73782d8 100644 --- a/elf/link.h +++ b/elf/link.h @@ -90,6 +90,12 @@ struct link_map Elf32_Word l_phnum; /* Number of program header entries. */ Elf32_Addr l_entry; /* Entry point location. */ + /* Array of DT_NEEDED dependencies and their dependencies, in + dependency order for symbol lookup. This is null before the + dependencies have been loaded. */ + struct link_map **l_searchlist; + unsigned int l_nsearchlist; + /* Symbol hash table. */ Elf32_Word l_nbuckets; const Elf32_Word *l_buckets, *l_chain; @@ -102,7 +108,6 @@ struct link_map lt_library, /* Library needed by main executable. */ lt_loaded, /* Extra run-time loaded shared object. */ } l_type:2; - unsigned int l_deps_loaded:1; /* Nonzero if DT_NEEDED items loaded. */ unsigned int l_relocated:1; /* Nonzero if object's relocations done. */ unsigned int l_init_called:1; /* Nonzero if DT_INIT function called. */ unsigned int l_init_running:1; /* Nonzero while DT_INIT function runs. */ @@ -176,22 +181,36 @@ extern struct link_map *_dl_map_object (struct link_map *loader, extern struct link_map *_dl_map_object_from_fd (const char *name, int fd, char *realname); +/* Call _dl_map_object on the dependencies of MAP, and + set up MAP->l_searchlist. */ +extern void _dl_map_object_deps (struct link_map *map); + /* Cache the locations of MAP's hash table. */ extern void _dl_setup_hash (struct link_map *map); +/* Open the shared object NAME, relocate it, and run its initializer if it + hasn't already been run. LOADER's DT_RPATH is used in searching for + NAME. MODE is as for `dlopen' (see ). If the object is + already opened, returns its existing map. */ +extern struct link_map *_dl_open (struct link_map *loader, + const char *name, int mode); + + + /* Search loaded objects' symbol tables for a definition of the symbol referred to by UNDEF. *SYM is the symbol table entry containing the reference; it is replaced with the defining symbol, and the base load - address of the defining object is returned. SYMBOL_SCOPE is the head of - the chain used for searching. REFERENCE_NAME should name the object - containing the reference; it is used in error messages. RELOC_ADDR is - the address being fixed up and the chosen symbol cannot be one with this - value. If NOPLT is nonzero, then the reference must not be resolved to - a PLT entry. */ + address of the defining object is returned. Each of SYMBOL_SCOPE[0] and + SYMBOL_SCOPE[1] that is not null and their dependencies are searched to + resolve the name. REFERENCE_NAME should name the object containing the + reference; it is used in error messages. RELOC_ADDR is the address + being fixed up and the chosen symbol cannot be one with this value. If + NOPLT is nonzero, then the reference must not be resolved to a PLT + entry. */ extern Elf32_Addr _dl_lookup_symbol (const char *undef, const Elf32_Sym **sym, - struct link_map *symbol_scope, + struct link_map *symbol_scope[2], const char *reference_name, Elf32_Addr reloc_addr, int noplt); -- cgit v1.1