[commits] r11885 - in /fsf/trunk/libc: ChangeLog elf/rtld.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Oct 27 00:03:15 2010
New Revision: 11885

Log:
Import glibc-mainline for 2010-10-27

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/elf/rtld.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Oct 27 00:03:15 2010
@@ -1,3 +1,8 @@
+2010-10-26  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* elf/rtld.c (dl_main): Move assertion after the point where rtld map
+	is added to the list.
+
 2010-10-20  Andreas Krebbel  <Andreas.Krebbel@xxxxxxxxxx>
 	    Ulrich Drepper  <drepper@xxxxxxxxx>
 

Modified: fsf/trunk/libc/elf/rtld.c
==============================================================================
--- fsf/trunk/libc/elf/rtld.c (original)
+++ fsf/trunk/libc/elf/rtld.c Wed Oct 27 00:03:15 2010
@@ -1108,7 +1108,6 @@
       main_map = _dl_new_object ((char *) "", "", lt_executable, NULL,
 				 __RTLD_OPENEXEC, LM_ID_BASE);
       assert (main_map != NULL);
-      assert (main_map == GL(dl_ns)[LM_ID_BASE]._ns_loaded);
       main_map->l_phdr = phdr;
       main_map->l_phnum = phnum;
       main_map->l_entry = *user_entry;
@@ -1116,6 +1115,7 @@
       /* Even though the link map is not yet fully initialized we can add
 	 it to the map list since there are no possible users running yet.  */
       _dl_add_to_namespace_list (main_map, LM_ID_BASE);
+      assert (main_map == GL(dl_ns)[LM_ID_BASE]._ns_loaded);
 
       /* At this point we are in a bit of trouble.  We would have to
 	 fill in the values for l_dev and l_ino.  But in general we