diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-10-15 14:35:31 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-10-18 09:51:56 -0300 |
| commit | 5118dcac68c4eadfd6304bb33adde63d062dc07f (patch) | |
| tree | a36d657aa4cf152f6eee05feac6d7171cb3816ad /elf/dl-reloc-static-pie.c | |
| parent | 1d3decee997ba2fc24af81803299b2f4f3c47063 (diff) | |
| download | glibc-5118dcac68c4eadfd6304bb33adde63d062dc07f.zip glibc-5118dcac68c4eadfd6304bb33adde63d062dc07f.tar.gz glibc-5118dcac68c4eadfd6304bb33adde63d062dc07f.tar.bz2 | |
elf: Fix elf_get_dynamic_info() for bootstrap
THe d6d89608ac8c broke powerpc for --enable-bind-now because it turned
out that different than patch assumption rtld elf_get_dynamic_info()
does require to handle RTLD_BOOTSTRAP to avoid DT_FLAGS and
DT_RUNPATH (more specially the GLRO usage which is not reallocate
yet).
This patch fixes by passing two arguments to elf_get_dynamic_info()
to inform that by rtld (bootstrap) or static pie initialization
(static_pie_bootstrap). I think using explicit argument is way more
clear and burried C preprocessor, and compiler should remove the
dead code.
I checked on x86_64 and i686 with default options, --enable-bind-now,
and --enable-bind-now and --enable--static-pie. I also check on
aarch64, armhf, powerpc64, and powerpc with default and
--enable-bind-now.
Diffstat (limited to 'elf/dl-reloc-static-pie.c')
| -rw-r--r-- | elf/dl-reloc-static-pie.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/elf/dl-reloc-static-pie.c b/elf/dl-reloc-static-pie.c index 40a031f..5b85df8 100644 --- a/elf/dl-reloc-static-pie.c +++ b/elf/dl-reloc-static-pie.c @@ -25,7 +25,6 @@ #include <dl-machine.h> -#define STATIC_PIE_BOOTSTRAP #define RESOLVE_MAP(map, scope, sym, version, flags) map #include "dynamic-link.h" #include "get-dynamic-info.h" @@ -52,7 +51,7 @@ _dl_relocate_static_pie (void) break; } - elf_get_dynamic_info (main_map); + elf_get_dynamic_info (main_map, false, true); # ifdef ELF_MACHINE_BEFORE_RTLD_RELOC ELF_MACHINE_BEFORE_RTLD_RELOC (main_map, main_map->l_info); |