diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-08-27 20:08:32 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-08-27 20:08:32 +0000 |
| commit | f787edde1dcd0f35feff9c8fd6384bd564558180 (patch) | |
| tree | 82ebec99452b9faf41a02c7d1790e0c64d35c826 /elf/rtld.c | |
| parent | 6075607b9abba5ae10b87a9913f2a26548021272 (diff) | |
| download | glibc-f787edde1dcd0f35feff9c8fd6384bd564558180.tar glibc-f787edde1dcd0f35feff9c8fd6384bd564558180.tar.gz glibc-f787edde1dcd0f35feff9c8fd6384bd564558180.tar.bz2 glibc-f787edde1dcd0f35feff9c8fd6384bd564558180.zip | |
Update.
1998-08-27 19:42 Ulrich Drepper <drepper@cygnus.com>
* elf/Makefile (distribute): Add dl-origin.h.
* sysdeps/generic/dl-origin.h: New file.
* sysdeps/unix/sysv/linux/dl-origin.h: New file.
* elf/link.h (struct link_map): Add l_origin field.
* elf/dl-load.c (expand_dynamic_string_token): New function.
(decompose_path): Remove WHERE argument, take link map pointer instead.
Call expand_dynamic_string_token instead of local_strdup to make copy
of rpath.
(_dl_init_paths): Call decompose_path with correct argument.
(_dl_map_object_from_fd): Define static is EXTERNAL_MAP_FROM_FD is
not defined.
Check EI_OSABI and EI_ABIVERSION fields in header.
(_dl_map_object): Call decompose_path with correct argument.
Call expand_dynamic_string_token instead of local_strdup to also
expand DST.
* elf/dl-object.c (_dl_new_object): Determine l_origin for all maps
but the main one.
* elf/dl-support.c: Define _dl_origin_path.
* elf/rtld.c: Likewise. Set _dl_origin_path based on LD_ORIGIN_PATH.
* elf/dl-close (_dl_close): Free l_name and l_origin.
* sysdeps/i386/useldt.h (THREAD_GETMEM, THREAD_SETMEM): Use P
modifier in asm, not c.
* sysdeps/mach/hurd/Makefile [subdirs==elf]: Define CFLAGS-dl-load.c
to -DEXTERNAL_MAP_FROM_FD to make _dl_map_object_from_fd extern.
Diffstat (limited to 'elf/rtld.c')
| -rw-r--r-- | elf/rtld.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/elf/rtld.c b/elf/rtld.c index 13c4f2698e..3b3dfbf669 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -87,6 +87,7 @@ int _dl_debug_reloc; int _dl_debug_files; const char *_dl_inhibit_rpath; /* RPATH values which should be ignored. */ +const char *_dl_origin_path; /* Set nonzero during loading and initialization of executable and libraries, cleared before the executable's entry point runs. This @@ -1164,6 +1165,12 @@ process_envvars (enum mode *modep, int *lazyp) _dl_hwcap_mask = strtoul (&envline[14], NULL, 0); break; + case 11: + /* Path where the binary is found. */ + if (memcmp (&envline[3], "ORIGIN_PATH", 11) == 0) + _dl_hwcap_mask = strtoul (&envline[15], NULL, 0); + break; + case 12: /* Where to place the profiling data file. */ if (memcmp (&envline[3], "DEBUG_OUTPUT", 12) == 0) |