aboutsummaryrefslogtreecommitdiff
path: root/elf/dl-load.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-06-16 02:18:58 +0000
committerRoland McGrath <roland@gnu.org>1996-06-16 02:18:58 +0000
commitf9496a7b54c27580d4b30cc2b2b40e86738b2b81 (patch)
tree67da370e3ecc6c9280f20cac507b5fc75700fc3a /elf/dl-load.c
parenta23db8e4af794430fe69c17bd884f03669d307d7 (diff)
downloadglibc-f9496a7b54c27580d4b30cc2b2b40e86738b2b81.zip
glibc-f9496a7b54c27580d4b30cc2b2b40e86738b2b81.tar.gz
glibc-f9496a7b54c27580d4b30cc2b2b40e86738b2b81.tar.bz2
* elf/dl-deps.c (_dl_map_object_deps): Set MAP's mark bit before loop.
Set mark bits of deps as opened, instead of as scanned. * elf/rtld.c (dl_main): Remove _dl_rtld_map from chain unconditionally. Then if it has a nonzero l_opencount, add it back in search order. * elf/dl-load.c (_dl_map_object): Don't use _dl_loaded's DT_RPATH if it ain't got one!
Diffstat (limited to 'elf/dl-load.c')
-rw-r--r--elf/dl-load.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c
index f947bb8..f655fda 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -479,7 +479,7 @@ _dl_map_object (struct link_map *loader, const char *name, int type)
l->l_info[DT_RPATH]->d_un.d_val));
/* If dynamically linked, try the DT_RPATH of the executable itself. */
l = _dl_loaded;
- if (fd == -1 && l && l->l_type != lt_loaded)
+ if (fd == -1 && l && l->l_type != lt_loaded && l->l_info[DT_RPATH])
trypath ((const char *) (l->l_addr +
l->l_info[DT_STRTAB]->d_un.d_ptr +
l->l_info[DT_RPATH]->d_un.d_val));