aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-11-01 04:46:27 +0000
committerUlrich Drepper <drepper@redhat.com>2001-11-01 04:46:27 +0000
commit955891779a86983ab073ebe2de1347ee40ed1f68 (patch)
tree4c0ca19d2754383b8fdd5ce7c30c0cd3b044eb6f /elf
parenta81289237c83f9f6c70430e55557d15df720aec1 (diff)
downloadglibc-955891779a86983ab073ebe2de1347ee40ed1f68.tar
glibc-955891779a86983ab073ebe2de1347ee40ed1f68.tar.gz
glibc-955891779a86983ab073ebe2de1347ee40ed1f68.tar.bz2
glibc-955891779a86983ab073ebe2de1347ee40ed1f68.zip
Update.
2001-10-31 Ulrich Drepper <drepper@redhat.com> * elf/dl-load.c (_dl_map_object): Make code a bit more compact by avoiding unnecessary duplication. 2001-10-31 Jakub Jelinek <jakub@redhat.com> * elf/dl-load.c (_dl_map_object): If library was found using LD_LIBRARY_PATH, don't try RUNPATH list. 2001-10-29 Kevin Ryde <user42@zip.com.au>
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-load.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 3e5ddc04f1..c712a7ecd9 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1608,7 +1608,8 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
&realname, &fb);
/* Look at the RUNPATH information for this binary. */
- if (loader != NULL && loader->l_runpath_dirs.dirs != (void *) -1)
+ if (fd == -1 && loader != NULL
+ && loader->l_runpath_dirs.dirs != (void *) -1)
{
if (loader->l_runpath_dirs.dirs == NULL)
{
@@ -1622,13 +1623,10 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
+ loader->l_info[DT_RUNPATH]->d_un.d_val);
decompose_rpath (&loader->l_runpath_dirs,
(const char *) ptrval, loader, "RUNPATH");
-
- if (loader->l_runpath_dirs.dirs != (void *) -1)
- fd = open_path (name, namelen, preloaded,
- &loader->l_runpath_dirs, &realname, &fb);
}
}
- else if (loader->l_runpath_dirs.dirs != (void *) -1)
+
+ if (loader->l_runpath_dirs.dirs != (void *) -1)
fd = open_path (name, namelen, preloaded,
&loader->l_runpath_dirs, &realname, &fb);
}