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.

1 files changed, 7 insertions, 13 deletions

diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c
index 424d303800..bfa0174444 100644
--- a/elf/dl-reloc.c
+++ b/elf/dl-reloc.c
@@ -54,12 +54,11 @@ _dl_relocate_object (struct link_map *l, int lazy)
     }
 
   {
-    struct link_map *real_next, *scope;
+    struct link_map *scope[2];
 
     const char *strtab
       = ((void *) l->l_addr + l->l_info[DT_STRTAB]->d_un.d_ptr);
 
-
     Elf32_Addr resolve (const Elf32_Sym **ref,
 			Elf32_Addr reloc_addr, int noplt)
       {
@@ -67,16 +66,16 @@ _dl_relocate_object (struct link_map *l, int lazy)
 				  l->l_name, reloc_addr, noplt);
       }
 
-    real_next = l->l_next;
     if (l->l_info[DT_SYMBOLIC])
       {
-	if (l->l_prev)
-	  l->l_prev->l_next = real_next;
-	l->l_next = _dl_loaded;
-	scope = l;
+	scope[0] = l;
+	scope[1] = _dl_loaded;
       }
     else
-      scope = _dl_loaded;
+      {
+	scope[0] = _dl_loaded;
+	scope[1] = l;
+      }
 
     if (l->l_type == lt_interpreter)
       /* We cannot be lazy when relocating the dynamic linker itself.  It
@@ -87,11 +86,6 @@ _dl_relocate_object (struct link_map *l, int lazy)
       lazy = 0;
 
     ELF_DYNAMIC_RELOCATE (l, lazy, resolve);
-
-    /* Restore list frobnication done above for DT_SYMBOLIC.  */
-    l->l_next = real_next;
-    if (l->l_prev)
-      l->l_prev->l_next = l;
   }
 
   /* Set up the PLT so its unrelocated entries will