* Makerules ($(common-objpfx)libc.so): Depend on $(elfobjdir)/ld.so.cvs/libc-960611

	* elf/dl-close.c: New file.
	* elf/link.h: Declare _dl_close.
	* elf/Makefile (routines): Add dl-close.
	* elf/dlclose.c (dlclose): Use _dl_close.

	* elf/Makefile ($(objpfx)librtld.so): Remove libelf from deps.

	* elf/dl-runtime.c (_dl_global_scope): New variable.
	(_dl_object_relocation_scope): New function.
	(fixup): Use it.
	* elf/rtld.c (dl_main): Use it.
	* elf/dl-open.c (_dl_open): Use it.  If (MODE & RTLD_GLOBAL), set the
	l_global bit and append the new map to _dl_global_scope.
	* elf/link.h: Declare _dl_global_scope, _dl_global_scope_alloc,
	and _dl_object_relocation_scope.

	* elf/link.h (struct link_map): Add l_loader member.
	Remove _dl_map_object_from_fd decl.
	* elf/dl-load.c (_dl_map_object): Pass LOADER to ...
	(_dl_map_object_from_fd): Take new arg LOADER and set l_loader member.
	(_dl_map_object): Try DT_RPATH from all loaders up the chain.

	* elf/dl-object.c (_dl_loaded): Variable removed.
	(_dl_default_scope): New variable replaces it.
	* elf/link.h (_dl_loaded): Remove variable decl; instead define as
	macro for _dl_default_scope[2].
	(_dl_default_scope): Declare it.
	* sysdeps/i386/dl-machine.h (RTLD_START): Use _dl_default_scope[2]
	instead of _dl_loaded.
	* sysdeps/m68k/dl-machine.h (RTLD_START): Likewise.
	* elf/rtld.c (dl_main): Use _dl_default_scope for symbol lookups.

	* elf/dl-reloc.c (_dl_relocate_object): Remove check for _dl_rtld_map.
	* elf/rtld.c (dl_main): Pass 0 for LAZY flag when re-relocating self.

	* elf/link.h (struct link_map.l_type): Remove lt_interpreter.
 	(struct link_map): Add new flag member l_global.

	* elf/dl-reloc.c (_dl_relocate_object): Check for _dl_rtld_map
	directly instead of looking for lt_interpreter.
	* sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise.
	* elf/rtld.c (_dl_start): Don't bother setting BOOTSTRAP_MAP.l_type.
	(dl_main): Set _dl_rtld_map.l_type to lt_library.

	* elf/dl-deps.c (_dl_map_object_deps): Propagate MAP->l_type to
	dependencies loaded, downgrading lt_executable -> lt_library.

	* elf/dl-load.c (_dl_map_object_from_fd): Take new arg TYPE and set
	l_type from that, translating lt_library->lt_executable based on the
	file's ELF type.
	(_dl_map_object): Likewise.
	* elf/link.h: Update prototypes.
	* elf/dl-open.c: Pass type lt_loaded.
	* elf/rtld.c: Pass type lt_library.

	* elf/dl-load.c (_dl_map_object_from_fd): Handle null return from
	_dl_new_object.
	(_dl_map_object_from_fd: lose): Unchain and free L if it's not null.
	Free REALNAME, and just use NAME in error message.
	* elf/dl-object.c (_dl_new_object): If malloc fails, return null
	instead of calling _dl_signal_error.

	* elf/dl-load.c (_dl_map_object_from_fd): Close FD before signalling
	error for _dl_zerofd setup failure.

	* elf/dl-object.c (_dl_startup_loaded): Variable removed.
	* elf/link.h: Remove its decl.

	* elf/dl-reloc.c (_dl_relocate_object): Take new SCOPE arg and pass it
	through to _dl_lookup_symbol.
	* elf/link.h (_dl_relocate_object): Update comment and prototype.
	* elf/rtld.c (dl_main): Pass scope vector to _dl_relocate_object.

	* elf/dl-lookup.c (_dl_lookup_symbol): Arg SYMBOL_SCOPE is now a
	null-terminated vector of pointers, no longer a vector of exactly two.
	* elf/link.h (_dl_lookup_symbol): Update comment and prototype.

	* elf/dl-runtime.c (fixup): Set up scope for symbol lookup properly as
	done in _dl_relocate_object.

	* elf/dlopen.c: Pass "" to _dl_open when FILE is null.

1 files changed, 1 insertions, 69 deletions

diff --git a/elf/dlclose.c b/elf/dlclose.c
index 0d2689e..a5c8e7c 100644
--- a/elf/dlclose.c
+++ b/elf/dlclose.c
@@ -19,81 +19,13 @@ Cambridge, MA 02139, USA.  */
 
 #include <link.h>
 #include <dlfcn.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-
-
-#define LOSE(s) _dl_signal_error (0, map->l_name, s)
 
 int
 dlclose (void *handle)
 {
   void doit (void)
     {
-      struct link_map *map = handle;
-      struct link_map **list;
-      unsigned int i;
-
-      if (map->l_opencount == 0)
-	LOSE ("shared object not open");
-
-      /* Decrement the reference count.  */
-      if (--map->l_opencount > 0 || map->l_type != lt_loaded)
-	/* There are still references to this object.  Do nothing more.  */
-	return;
-
-      list = map->l_searchlist;
-
-      /* The search list contains a counted reference to each object it
-	 points to, the 0th elt being MAP itself.  Decrement the reference
-	 counts on all the objects MAP depends on.  */
-      for (i = 1; i < map->l_nsearchlist; ++i)
-	--list[i]->l_opencount;
-
-      /* Clear the search list so it doesn't get freed while we are still
-         using it.  We have cached it in LIST and will free it when
-         finished.  */
-      map->l_searchlist = NULL;
-
-      /* Check each element of the search list to see if all references to
-         it are gone.  */
-      for (i = 0; i < map->l_nsearchlist; ++i)
-	{
-	  struct link_map *map = list[i];
-	  if (map->l_opencount == 0 && map->l_type == lt_loaded)
-	    {
-	      /* That was the last reference, and this was a dlopen-loaded
-		 object.  We can unmap it.  */
-	      const ElfW(Phdr) *ph;
-
-	      if (map->l_info[DT_FINI])
-		/* Call its termination function.  */
-		(*(void (*) (void)) ((void *) map->l_addr +
-				     map->l_info[DT_FINI]->d_un.d_ptr)) ();
-
-	      /* Unmap the segments.  */
-	      for (ph = map->l_phdr; ph < &map->l_phdr[map->l_phnum]; ++ph)
-		if (ph->p_type == PT_LOAD)
-		  {
-		    ElfW(Addr) mapstart = ph->p_vaddr & ~(ph->p_align - 1);
-		    ElfW(Addr) mapend = ((ph->p_vaddr + ph->p_memsz
-					  + ph->p_align - 1)
-					 & ~(ph->p_align - 1));
-		    munmap ((caddr_t) mapstart, mapend - mapstart);
-		  }
-
-	      /* Finally, unlink the data structure and free it.  */
-	      map->l_prev->l_next = map->l_next;
-	      if (map->l_next)
-		map->l_next->l_prev = map->l_prev;
-	      if (map->l_searchlist)
-		free (map->l_searchlist);
-	      free (map);
-	    }
-	}
-
-      free (list);
+      _dl_close (handle);
     }
 
   return _dlerror_run (doit) ? -1 : 0;