* sysdeps/mach/hurd/dl-sysdep.c (_dl_sysdep_start): If started by

	kernel with args on stack, point _dl_hurd_data at zero data
	instead of garbage.  When ld.so run as program, grok args
	-LIB=MEMOBJ and pre-load shared object files found in memory
	objects loaded by the boot loader.

	* elf/link.h (struct link_map): New member `l_entry'.
	(_dl_map_object, _dl_map_object_from_fd): Remove last arg ENTRY_POINT.
	* elf/dl-load.c (_dl_map_object, _dl_map_object_from_fd): Remove
	last arg ENTRY_POINT.  Store the entry point location in the
	`l_entry' member of the new map.
	* elf/rtld.c (dl_main): Don't pass USER_ENTRY arg to
	_dl_map_object.  When run as program, set *USER_ENTRY to L->l_entry.
	* elf/dl-init.c (_dl_init_next): Don't pass ENTRY_POINT arg to
	_dl_map_object.

1 files changed, 4 insertions, 2 deletions

diff --git a/elf/rtld.c b/elf/rtld.c
index df91573ad1..276ff51e57 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -151,11 +151,12 @@ of this helper program; chances are you did not intend to run this program.\n",
 	  interpreter_name = _dl_argv[0];
 	  --_dl_argc;
 	  ++_dl_argv;
-	  l = _dl_map_object (NULL, _dl_argv[0], user_entry);
+	  l = _dl_map_object (NULL, _dl_argv[0]);
 	  phdr = l->l_phdr;
 	  phent = l->l_phnum;
 	  l->l_type = lt_executable;
 	  l->l_libname = (char *) "";
+	  *user_entry = l->l_entry;
 	}
       else
 	{
@@ -165,6 +166,7 @@ of this helper program; chances are you did not intend to run this program.\n",
 	  l->l_phdr = phdr;
 	  l->l_phnum = phent;
 	  interpreter_name = 0;
+	  l->l_entry = *user_entry;
 	}
 
       if (l != _dl_loaded)
@@ -228,7 +230,7 @@ of this helper program; chances are you did not intend to run this program.\n",
 	      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, NULL);
+		  _dl_map_object (l, strtab + d->d_un.d_val);
 	    }
 	  l->l_deps_loaded = 1;
 	}