about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-10-28 06:53:20 +0000
committerUlrich Drepper <drepper@redhat.com>2004-10-28 06:53:20 +0000
commit7d4afb9b7fa6fabe5066f5e2ab4958f717fa8ada (patch)
tree1d3d6ec2ec9a563836abb8893b5abc0adc5c5df9 /elf
parent32738a227007c089581a62621c673dceabd1c08d (diff)
downloadglibc-7d4afb9b7fa6fabe5066f5e2ab4958f717fa8ada.tar.gz
glibc-7d4afb9b7fa6fabe5066f5e2ab4958f717fa8ada.tar.xz
glibc-7d4afb9b7fa6fabe5066f5e2ab4958f717fa8ada.zip
Update.
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.
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-load.c2
-rw-r--r--elf/tst-dlmopen3.c1
2 files changed, 1 insertions, 2 deletions
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