diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | elf/dl-load.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 821a58194f..f4750b1985 100644 --- 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 1ad16a0d65..f8660665e0 100644 --- 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 |