aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--elf/dl-load.c6
-rw-r--r--elf/dl-support.c2
-rw-r--r--elf/ldsodefs.h2
-rw-r--r--elf/rtld.c18
-rwxr-xr-xiconvdata/run-iconv-test.sh2
6 files changed, 24 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 24c53c7e06..4053a097bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1998-05-20 00:10 Ulrich Drepper <drepper@cygnus.com>
+
+ * elf/dl-load.c: Rename option and variable from ignore-rpath to
+ inhibit-rpath.
+ * elf/dl-support.c: Likewise.
+ * elf/ldsodefs.h: Likewise.
+ * elf/rtld.c: Likewise.
+ * iconvdata/run-iconv-test.sh: Likewise.
+
1998-05-19 23:08 Ulrich Drepper <drepper@cygnus.com>
* elf/rtld.c: Recognize --ignore-rpath argument and set _dl_ignore_path
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 4fc0a022d6..5a70dec85c 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -290,13 +290,13 @@ decompose_rpath (const char *rpath, size_t additional_room, const char *where)
size_t nelems;
/* First see whether we must forget the RPATH from this object. */
- if (_dl_ignore_rpath != NULL && !__libc_enable_secure)
+ if (_dl_inhibit_rpath != NULL && !__libc_enable_secure)
{
- const char *found = strstr (_dl_ignore_rpath, where);
+ const char *found = strstr (_dl_inhibit_rpath, where);
if (found != NULL)
{
size_t len = strlen (where);
- if ((found == _dl_ignore_rpath || found[-1] == ':')
+ if ((found == _dl_inhibit_rpath || found[-1] == ':')
&& (found[len] == '\0' || found[len] == ':'))
{
/* This object is on the list of objects for which the RPATH
diff --git a/elf/dl-support.c b/elf/dl-support.c
index 0a14b6d1bd..9012a0c2a6 100644
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -56,7 +56,7 @@ 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;
+const char *_dl_inhibit_rpath;
static void non_dynamic_init (void) __attribute__ ((unused));
diff --git a/elf/ldsodefs.h b/elf/ldsodefs.h
index a64f51bca6..a2bfc0b210 100644
--- a/elf/ldsodefs.h
+++ b/elf/ldsodefs.h
@@ -150,7 +150,7 @@ extern unsigned long int _dl_hwcap_mask;
extern int _dl_debug_fd;
/* Names of shared object for which the RPATH should be ignored. */
-extern const char *_dl_ignore_rpath;
+extern const char *_dl_inhibit_rpath;
/* OS-dependent function to open the zero-fill device. */
extern int _dl_sysdep_open_zero_fill (void); /* dl-sysdep.c */
diff --git a/elf/rtld.c b/elf/rtld.c
index 51a295cfb2..fe676f7005 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -81,7 +81,7 @@ int _dl_debug_symbols;
int _dl_debug_versions;
int _dl_debug_reloc;
int _dl_debug_files;
-const char *_dl_ignore_rpath; /* RPATH values which should be
+const char *_dl_inhibit_rpath; /* RPATH values which should be
ignored. */
/* Set nonzero during loading and initialization of executable and
@@ -344,9 +344,9 @@ dl_main (const ElfW(Phdr) *phdr,
_dl_argc -= 2;
_dl_argv += 2;
}
- else if (! strcmp (_dl_argv[1], "--ignore-rpath") && _dl_argc > 2)
+ else if (! strcmp (_dl_argv[1], "--inhibit-rpath") && _dl_argc > 2)
{
- _dl_ignore_rpath = _dl_argv[2];
+ _dl_inhibit_rpath = _dl_argv[2];
_dl_skip_args += 2;
_dl_argc -= 2;
@@ -372,12 +372,12 @@ specified, instead of the helper program file specified in the executable\n\
file you run. This is mostly of use for maintainers to test new versions\n\
of this helper program; chances are you did not intend to run this program.\n\
\n\
- --list list all dependencies and how they are resolved\n\
- --verify verify that given object really is a dynamically linked\n\
- object we get handle\n\
- --library-path PATH use given PATH instead of content of the environment\n\
- variable LD_LIBRARY_PATH\n\
- --ignore-rpath LIST ignore RPATH information in object names in LIST\n",
+ --list list all dependencies and how they are resolved\n\
+ --verify verify that given object really is a dynamically linked\n\
+ object we get handle\n\
+ --library-path PATH use given PATH instead of content of the environment\n\
+ variable LD_LIBRARY_PATH\n\
+ --inhibit-rpath LIST ignore RPATH information in object names in LIST\n",
NULL);
++_dl_skip_args;
diff --git a/iconvdata/run-iconv-test.sh b/iconvdata/run-iconv-test.sh
index 90ab8b7fe5..17f58ba41c 100755
--- a/iconvdata/run-iconv-test.sh
+++ b/iconvdata/run-iconv-test.sh
@@ -36,7 +36,7 @@ export GCONV_PATH
LIBPATH=$codir:$codir/iconvdata
# How the start the iconv(1) program.
-ICONV='$codir/elf/ld.so --library-path $LIBPATH --ignore-rpath ${from}.so \
+ICONV='$codir/elf/ld.so --library-path $LIBPATH --inhibit-rpath ${from}.so \
$codir/iconv/iconv_prog'
# We read the file named TESTS. All non-empty lines not starting with