diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-01-13 17:58:00 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-02-10 09:16:12 -0300 |
| commit | 6628c742b2c16e785d3c884d9deeda5adb30ca12 (patch) | |
| tree | 493580e40aef171896584e1d3d32bbe14c15140b /sysdeps/alpha/dl-machine.h | |
| parent | 8c8510ab2790039e58995ef3a22309582413d3ff (diff) | |
| download | glibc-6628c742b2c16e785d3c884d9deeda5adb30ca12.tar glibc-6628c742b2c16e785d3c884d9deeda5adb30ca12.tar.gz glibc-6628c742b2c16e785d3c884d9deeda5adb30ca12.tar.bz2 glibc-6628c742b2c16e785d3c884d9deeda5adb30ca12.zip | |
elf: Remove prelink support
Prelinked binaries and libraries still work, the dynamic tags
DT_GNU_PRELINKED, DT_GNU_LIBLIST, DT_GNU_CONFLICT just ignored
(meaning the process is reallocated as default).
The loader environment variable TRACE_PRELINKING is also removed,
since it used solely on prelink.
Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu.
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
Diffstat (limited to 'sysdeps/alpha/dl-machine.h')
| -rw-r--r-- | sysdeps/alpha/dl-machine.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/sysdeps/alpha/dl-machine.h b/sysdeps/alpha/dl-machine.h index 47cfefdc31..30fc790e88 100644 --- a/sysdeps/alpha/dl-machine.h +++ b/sysdeps/alpha/dl-machine.h @@ -423,23 +423,8 @@ elf_machine_rela (struct link_map *map, struct r_scope_elem *scope[], if (r_type == R_ALPHA_GLOB_DAT) *reloc_addr = sym_value; -#ifdef RESOLVE_CONFLICT_FIND_MAP - /* In .gnu.conflict section, R_ALPHA_JMP_SLOT relocations have - R_ALPHA_JMP_SLOT in lower 8 bits and the remaining 24 bits - are .rela.plt index. */ - else if ((r_type & 0xff) == R_ALPHA_JMP_SLOT) - { - /* elf_machine_fixup_plt needs the map reloc_addr points into, - while in _dl_resolve_conflicts map is _dl_loaded. */ - RESOLVE_CONFLICT_FIND_MAP (map, reloc_addr); - reloc = ((const Elf64_Rela *) D_PTR (map, l_info[DT_JMPREL])) - + (r_type >> 8); - elf_machine_fixup_plt (map, 0, 0, 0, reloc, reloc_addr, sym_value); - } -#else else if (r_type == R_ALPHA_JMP_SLOT) elf_machine_fixup_plt (map, 0, 0, 0, reloc, reloc_addr, sym_value); -#endif #ifndef RTLD_BOOTSTRAP else if (r_type == R_ALPHA_REFQUAD) { |