Fix loading first object along a path when tracing.

diff --git a/ChangeLog b/ChangeLog
index 821a58194f55cd230d03d9e60fae4caa71628bbc..f4750b1985b90f8629fa4254b505c95990d874eb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-06  Ulrich Drepper  <drepper@gmail.com>
+
+       * 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@amd.com>
            Ulrich Drepper  <drepper@gmail.com>
 

diff --git a/elf/dl-load.c b/elf/dl-load.c
index 1ad16a0d65c5e925fb5c28507fe49fbb3fac9af5..f8660665e0add53c45650693b18a70762c72f217 100644 (file)
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -2111,7 +2111,9 @@ _dl_map_object (struct link_map *loader, const char *name,
            {
 #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