From 310930c1b53bf795e62572d7b7f2fe384cbdc0d4 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 19 May 1998 23:18:44 +0000 Subject: Update. 1998-05-19 23:08 Ulrich Drepper * elf/rtld.c: Recognize --ignore-rpath argument and set _dl_ignore_path variable using the value. * elf/ldsodefs.h: Declare _dl_ignore_path. * elf/dl-load.c (decompose_rpath): Compare name of handled shared object against list in _dl_ignore_path and ignore RPATH if on the list. * elf/dl-support.c: Define _dl_ignore_path for static binaries. * iconvdata/run-iconv-test.sh: Call ld.so with --ignore-rpath parameter to make sure we get the correct helper libraries loaded. * elf/dl-load.c (decompose_rpath): Remove `room' parameter. Use "RPATH" string in call to fillin_rpath instead. (_dl_init_paths): Remove this parameter from call to decompose_rpath. --- elf/dl-support.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'elf/dl-support.c') diff --git a/elf/dl-support.c b/elf/dl-support.c index 2702404444..0a14b6d1bd 100644 --- a/elf/dl-support.c +++ b/elf/dl-support.c @@ -55,6 +55,9 @@ struct r_search_path *_dl_search_paths; const char *_dl_profile; struct link_map *_dl_profile_map; +/* Names of shared object for which the RPATHs should be ignored. */ +const char *_dl_ignore_rpath; + static void non_dynamic_init (void) __attribute__ ((unused)); -- cgit 1.4.1