diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-10-03 01:55:00 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-10-03 01:55:12 -0700 |
| commit | b8818ab592ce1012d481604284f66552bd451910 (patch) | |
| tree | 9f61e899f037ee8118ec01b0c2501a0df00880c1 /elf/rtld.c | |
| parent | 3d1870fa3301c5cd00d5fdab0014c4e22b71fef2 (diff) | |
| download | glibc-b8818ab592ce1012d481604284f66552bd451910.zip glibc-b8818ab592ce1012d481604284f66552bd451910.tar.gz glibc-b8818ab592ce1012d481604284f66552bd451910.tar.bz2 | |
ld.so: Replace (&bootstrap_map) with BOOTSTRAP_MAP
(&_dl_main_map) is used instead of (&bootstrap_map) to bootstrap static
PIE. Define BOOTSTRAP_MAP with (&_dl_main_map) to avoid hardcode to
(&bootstrap_map).
* elf/rtld.c (BOOTSTRAP_MAP): New.
(RESOLVE_MAP): Replace (&bootstrap_map) with BOOTSTRAP_MAP.
* sysdeps/hppa/dl-machine.h (ELF_MACHINE_BEFORE_RTLD_RELOC):
Likewise.
* sysdeps/ia64/dl-machine.h (ELF_MACHINE_BEFORE_RTLD_RELOC):
Likewise.
* sysdeps/mips/dl-machine.h (ELF_MACHINE_BEFORE_RTLD_RELOC):
Likewise.
Diffstat (limited to 'elf/rtld.c')
| -rw-r--r-- | elf/rtld.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -454,7 +454,8 @@ _dl_start (void *arg) Since ld.so must not have any undefined symbols the result is trivial: always the map of ld.so itself. */ #define RTLD_BOOTSTRAP -#define RESOLVE_MAP(sym, version, flags) (&bootstrap_map) +#define BOOTSTRAP_MAP (&bootstrap_map) +#define RESOLVE_MAP(sym, version, flags) BOOTSTRAP_MAP #include "dynamic-link.h" if (HP_TIMING_INLINE && HP_SMALL_TIMING_AVAIL) |