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/ldsodefs.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'elf/ldsodefs.h') diff --git a/elf/ldsodefs.h b/elf/ldsodefs.h index 19d931fd4e..a64f51bca6 100644 --- a/elf/ldsodefs.h +++ b/elf/ldsodefs.h @@ -149,6 +149,9 @@ extern unsigned long int _dl_hwcap_mask; /* File deccriptor to write debug messages to. */ extern int _dl_debug_fd; +/* Names of shared object for which the RPATH should be ignored. */ +extern const char *_dl_ignore_rpath; + /* OS-dependent function to open the zero-fill device. */ extern int _dl_sysdep_open_zero_fill (void); /* dl-sysdep.c */ -- cgit v1.2.3