projects
/
external
/
glibc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7e4ba49
)
Fix loading first object along a path when tracing.
author
Ulrich Drepper
<drepper@gmail.com>
Sun, 6 Mar 2011 05:01:50 +0000
(
00:01
-0500)
committer
Ulrich Drepper
<drepper@gmail.com>
Sun, 6 Mar 2011 05:01:50 +0000
(
00:01
-0500)
ChangeLog
patch
|
blob
|
history
elf/dl-load.c
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index
821a581
..
f4750b1
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
1ad16a0
..
f866066
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