diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | elf/dl-load.c | 2 | ||||
| -rw-r--r-- | elf/tst-dlmopen3.c | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 3c9ae36f17..c697ef8f43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-10-27 Ulrich Drepper <drepper@redhat.com> + + * elf/dl-load.c (_dl_map_object): Use cache_rpath to check for + existing rpath in main executable, not explicit test. + 2004-10-27 Jakub Jelinek <jakub@redhat.com> * include/resolv.h (_res_opcodes): New extern. diff --git a/elf/dl-load.c b/elf/dl-load.c index 27f6e3f641..ea287cddcc 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1875,7 +1875,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded, { l = GL(dl_ns)[LM_ID_BASE]._ns_loaded; if (l && l->l_type != lt_loaded && l != loader - && l->l_rpath_dirs.dirs != (void *) -1) + && cache_rpath (l, &l->l_rpath_dirs, DT_RPATH, "RPATH")) fd = open_path (name, namelen, preloaded, &l->l_rpath_dirs, &realname, &fb); } diff --git a/elf/tst-dlmopen3.c b/elf/tst-dlmopen3.c index da951ca806..26c86b2dca 100644 --- a/elf/tst-dlmopen3.c +++ b/elf/tst-dlmopen3.c @@ -1,6 +1,5 @@ #include <dlfcn.h> #include <stdio.h> -#include <gnu/lib-names.h> static int |