aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-05-27 05:32:14 +0000
committerUlrich Drepper <drepper@redhat.com>2000-05-27 05:32:14 +0000
commit4c540916eaf342e36afc6f3ea602275f7baff370 (patch)
tree9e636ad93971a22539de621f86b73a3c06eb508e
parent0a5503211cb00d4d5198702b5d712385ac564a93 (diff)
downloadglibc-4c540916eaf342e36afc6f3ea602275f7baff370.tar
glibc-4c540916eaf342e36afc6f3ea602275f7baff370.tar.gz
glibc-4c540916eaf342e36afc6f3ea602275f7baff370.tar.bz2
glibc-4c540916eaf342e36afc6f3ea602275f7baff370.zip
Update.
* elf/dl-load.c (_dl_map_object): Don't ignore RPATHs of loader == NULL.
-rw-r--r--ChangeLog3
-rw-r--r--elf/dl-load.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 906df1204c..17f6b6cb70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2000-05-26 Ulrich Drepper <drepper@redhat.com>
+ * elf/dl-load.c (_dl_map_object): Don't ignore RPATHs of loader ==
+ NULL.
+
* posix/tst-preadwrite.c: Allow parallel execution of
tst-preadwrite and tst-preadwrite64.
diff --git a/elf/dl-load.c b/elf/dl-load.c
index f5b2bcd031..17ce562ddd 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1346,7 +1346,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
/* When the object has the RUNPATH information we don't use any
RPATHs. */
- if (loader != NULL && loader->l_info[DT_RUNPATH] == NULL)
+ if (loader == NULL || loader->l_info[DT_RUNPATH] == NULL)
{
/* First try the DT_RPATH of the dependent object that caused NAME
to be loaded. Then that object's dependent, and on up. */