From fcf70d4114db9ff7923f5dfeb3fea6e2d623e5c2 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 24 Jul 1999 19:45:13 +0000 Subject: Update. 1999-07-24 Ulrich Drepper * 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. --- elf/rtld.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'elf/rtld.c') 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; -- cgit v1.2.3