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.
This commit is contained in:
Ulrich Drepper 2004-10-28 06:53:20 +00:00
parent 32738a2270
commit 7d4afb9b7f
3 changed files with 6 additions and 2 deletions

View File

@ -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.

View File

@ -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);
}

View File

@ -1,6 +1,5 @@
#include <dlfcn.h>
#include <stdio.h>
#include <gnu/lib-names.h>
static int