Thu Jun 13 00:02:25 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>

	* elf/dl-lookup.c (_dl_lookup_symbol): If no value and *REF is
	null, consider it a strong reference and give the error.

Wed Jun 12 15:52:46 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>

	* elf/dl-open.c (_dl_open): Correctly terminate relocating loop
 	after relocating NEW when it's the only new object.

	* elf/dl-init.c (_dl_init_next): When out of initializers, set
 	_r_debug.r_state to RT_CONSISTENT and call _dl_debug_state just
 	before return.

	* elf/rtld.c (dl_main): Move _dl_debug_initialize call after
 	relocation.  Call it unconditionally and only fill in DT_DEBUG
 	if it's present.  Then call _dl_debug_state with r_state RT_ADD
 	before running initializers.

	* elf/dl-open.c (_dl_open): Call _dl_debug_initialize and then call
 	_dl_debug_state with r_state RT_ADD before running initializers
	* elf/dl-close.c (_dl_close): Call _dl_debug_state with r_state
 	RT_DELETE before running finalizers and with RT_CONSISTENT just
 	before return.

	* elf/Makefile (dl-routines): Add dl-debug.
	* elf/dl-debug.c: New file.
	* elf/rtld.c (_dl_r_debug): Rename to _r_debug and move to dl-debug.c.
	(_dl_r_debug_state): Rename to _dl_debug_state and likewise move.
	(dl_main): Use _dl_debug_initialize.
	* elf/link.h: Fix name to _dl_debug_state in decl.
	(_dl_debug_initialize): Declare new function from dl-debug.c.
	(_r_debug): Declare it.

	* Makerules (distinfo-vars): Add install-{lib,data,bin,sbin,others}.
	In distinfo set $(subdir)-VAR and then set VAR to $($(subdir)-VAR).

	* Makeconfig (rpath-link): New variable; add $(elfobjdir).
	(default-rpath): Use it.
	(built-program-cmd): Use it in LD_LIBRARY_PATH.

	* Makeconfig (sysdep-configures): Prepend $(sysdep_dir) to names tried.

	* sysdeps/unix/Dist: Add make-syscalls.sh.

	* misc/Makefile (headers): Add sys/swap.h.
	* posix/unistd.h: Remove decls for swapon, swapoff.
	* sysdeps/generic/sys/swap.h: New file.
	* sysdeps/unix/sysv/linux/sys/swap.h: New file.

	* sysdeps/unix/sysv/linux/gnu/types.h: Remove temporary hack #define
	of __kernel_fsid_t.  It is correctly defines in <linux/types.h> now.

1 files changed, 14 insertions, 20 deletions

diff --git a/elf/rtld.c b/elf/rtld.c
index c9ddfb5c63..7befc0a82f 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -46,8 +46,6 @@ int _dl_argc;
 char **_dl_argv;
 const char *_dl_rpath;
 
-struct r_debug _dl_r_debug;
-
 static void dl_main (const ElfW(Phdr) *phdr,
 		     ElfW(Half) phent,
 		     ElfW(Addr) *user_entry);
@@ -229,12 +227,6 @@ of this helper program; chances are you did not intend to run this program.\n",
     /* Set up our cache of pointers into the hash table.  */
     _dl_setup_hash (l);
 
-  if (l->l_info[DT_DEBUG])
-    /* There is a DT_DEBUG entry in the dynamic section.  Fill it in
-       with the run-time address of the r_debug structure, which we
-       will set up later to communicate with the debugger.  */
-    l->l_info[DT_DEBUG]->d_un.d_ptr = (ElfW(Addr)) &_dl_r_debug;
-
   /* Put the link_map for ourselves on the chain so it can be found by
      name.  */
   _dl_rtld_map.l_name = (char *) _dl_rtld_map.l_libname = interpreter_name;
@@ -343,11 +335,20 @@ of this helper program; chances are you did not intend to run this program.\n",
       _dl_relocate_object (&_dl_rtld_map, &_dl_default_scope[2], 0);
   }
 
-  /* Tell the debugger where to find the map of loaded objects.  */
-  _dl_r_debug.r_version = 1	/* R_DEBUG_VERSION XXX */;
-  _dl_r_debug.r_ldbase = _dl_rtld_map.l_addr; /* Record our load address.  */
-  _dl_r_debug.r_map = _dl_loaded;
-  _dl_r_debug.r_brk = (ElfW(Addr)) &_dl_r_debug_state;
+  {
+    /* Initialize _r_debug.  */
+    struct r_debug *r = _dl_debug_initialize (_dl_rtld_map.l_addr);
+
+    l = _dl_loaded;
+    if (l->l_info[DT_DEBUG])
+      /* There is a DT_DEBUG entry in the dynamic section.  Fill it in
+	 with the run-time address of the r_debug structure  */
+      l->l_info[DT_DEBUG]->d_un.d_ptr = (ElfW(Addr)) r;
+
+    /* Notify the debugger that all objects are now mapped in.  */
+    r->r_state = RT_ADD;
+    _dl_debug_state ();
+  }
 
   if (_dl_rtld_map.l_info[DT_INIT])
     {
@@ -365,10 +366,3 @@ of this helper program; chances are you did not intend to run this program.\n",
   /* Once we return, _dl_sysdep_start will invoke
      the DT_INIT functions and then *USER_ENTRY.  */
 }
-
-/* This function exists solely to have a breakpoint set on it by the
-   debugger.  */
-void
-_dl_r_debug_state (void)
-{
-}