[commits] r13066 - in /fsf/trunk/libc: ChangeLog elf/dl-load.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Mon Mar  7 00:04:01 2011
New Revision: 13066

Log:
Import glibc-mainline for 2011-03-07

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/elf/dl-load.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Mon Mar  7 00:04:01 2011
@@ -1,3 +1,8 @@
+2011-03-06  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* elf/dl-load.c (_dl_map_object): If we are looking for the first
+	to-be-loaded object along a path to loader is ld.so.
+
 2011-03-02  Harsha Jagasia  <harsha.jagasia@xxxxxxx>
 	    Ulrich Drepper  <drepper@xxxxxxxxx>
 

Modified: fsf/trunk/libc/elf/dl-load.c
==============================================================================
--- fsf/trunk/libc/elf/dl-load.c (original)
+++ fsf/trunk/libc/elf/dl-load.c Mon Mar  7 00:04:01 2011
@@ -2111,7 +2111,9 @@
 	    {
 #ifdef SHARED
 	      // XXX Correct to unconditionally default to namespace 0?
-	      l = loader ?: GL(dl_ns)[LM_ID_BASE]._ns_loaded;
+	      l = (loader
+		   ?: GL(dl_ns)[LM_ID_BASE]._ns_loaded
+		   ?: &GL(dl_rtld_map));
 #else
 	      l = loader;
 #endif