aboutsummaryrefslogtreecommitdiff
path: root/elf/dl-load.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-08-09 06:41:04 +0000
committerUlrich Drepper <drepper@redhat.com>2004-08-09 06:41:04 +0000
commitc14e91352e26aa4e1622f08bb9a25a9527a8db2b (patch)
treebb3fe3f376564b7a9cf5ca4d6d89c0ad55e6a276 /elf/dl-load.c
parent807645d725f68619543836e196ae49f7b5fb5505 (diff)
downloadglibc-c14e91352e26aa4e1622f08bb9a25a9527a8db2b.tar
glibc-c14e91352e26aa4e1622f08bb9a25a9527a8db2b.tar.gz
glibc-c14e91352e26aa4e1622f08bb9a25a9527a8db2b.tar.bz2
glibc-c14e91352e26aa4e1622f08bb9a25a9527a8db2b.zip
[BZ #116]
Update. * elf/dl-load.c (_dl_map_object): If __RTLD_CALLMAP flag is set, reset loader before the actual loading. * elf/dl-open.c (dl_open_worker): If file name contains no path element determine map of caller. Pass caller map in this case to _dl_map_object. Set __RTLD_CALLMAP in mode. * include/dlfcn.h (__RTLD_CALLMAP): Define. [BZ #116] Patch by Greg Wolodkin <greg@mathworks.com>.
Diffstat (limited to 'elf/dl-load.c')
-rw-r--r--elf/dl-load.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c
index afbb06b9e5..cb0642a6d2 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1914,6 +1914,12 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
}
}
+ /* In case the LOADER information has only been provided to get to
+ the appropriate RUNPATH/RPATH information we do not need it
+ anymore. */
+ if (mode & __RTLD_CALLMAP)
+ loader = NULL;
+
if (__builtin_expect (fd, 0) == -1)
{
if (trace_mode