diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-07-24 19:45:13 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-07-24 19:45:13 +0000 |
| commit | fcf70d4114db9ff7923f5dfeb3fea6e2d623e5c2 (patch) | |
| tree | 772e5473a5404c04bf293d2b90db1e83f9075a1a /elf/rtld.c | |
| parent | 3f3822198993be18d4d9ccb1593eea274dbd2ba0 (diff) | |
| download | glibc-fcf70d4114db9ff7923f5dfeb3fea6e2d623e5c2.tar glibc-fcf70d4114db9ff7923f5dfeb3fea6e2d623e5c2.tar.gz glibc-fcf70d4114db9ff7923f5dfeb3fea6e2d623e5c2.tar.bz2 glibc-fcf70d4114db9ff7923f5dfeb3fea6e2d623e5c2.zip | |
Update.
1999-07-24 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-fini.c: Handle DT_FINI_ARRAY.
* elf/link.h (struct link_map): Remove l_init_running. Add l_runcount
and l_initcount.
* elf/dl-init.c: Handle DT_INIT_ARRAY.
* elf/dynamic-link.h: Change parameters. Now only get link_map
pointer. Calculate l_initcount.
* elf/link.h (struct link_map): Add l_runpath_dirs.
* elf/dynamic-link.h: If RUNPATH is given, set RPATH to NULL.
* elf/dl-load.c: Pretty print.
(decompose_rpath): Take new parameter with info from where the path
comes. Pass it the fillin_rpath.
(_dl_init_paths): Initialize l_runpath_dirs.
(_dl_map_object): Don't search using RPATHs if object has RUNPATH.
Search using RUNPATH after LD_LIBRARY_PATH.
* elf/dl-support.c: Adjust comment.
* elf/rtld.c: Adjust help message.
Diffstat (limited to 'elf/rtld.c')
| -rw-r--r-- | elf/rtld.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/elf/rtld.c b/elf/rtld.c index 808cc9df96..60293800c5 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -448,7 +448,8 @@ of this helper program; chances are you did not intend to run this program.\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", + --inhibit-rpath LIST ignore RUNPATH and RPATH information in object names\n\ + in LIST\n", NULL); ++_dl_skip_args; |