From 7d4afb9b7fa6fabe5066f5e2ab4958f717fa8ada Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 28 Oct 2004 06:53:20 +0000 Subject: Update. 2004-10-27 Ulrich Drepper * elf/dl-load.c (_dl_map_object): Use cache_rpath to check for existing rpath in main executable, not explicit test. --- elf/dl-load.c | 2 +- elf/tst-dlmopen3.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'elf') 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 #include -#include static int -- cgit 1.4.1