diff options
Diffstat (limited to 'sysdeps/alpha/dl-machine.h')
| -rw-r--r-- | sysdeps/alpha/dl-machine.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sysdeps/alpha/dl-machine.h b/sysdeps/alpha/dl-machine.h index 25a63c798c..810ca30fa4 100644 --- a/sysdeps/alpha/dl-machine.h +++ b/sysdeps/alpha/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. Alpha version. - Copyright (C) 1996-2016 Free Software Foundation, Inc. + Copyright (C) 1996-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Richard Henderson <rth@tamu.edu>. @@ -260,6 +260,7 @@ dl_platform_init (void) rather than the dynamic linker. */ static inline Elf64_Addr elf_machine_fixup_plt (struct link_map *map, lookup_t t, + const ElfW(Sym) *refsym, const ElfW(Sym) *sym, const Elf64_Rela *reloc, Elf64_Addr *got_addr, Elf64_Addr value) { @@ -418,7 +419,7 @@ elf_machine_rela (struct link_map *map, if (sym_map) { sym_raw_value += sym->st_value; - sym_value = sym_raw_value + sym_map->l_addr; + sym_value += SYMBOL_ADDRESS (sym_map, sym, true); } if (r_type == R_ALPHA_GLOB_DAT) @@ -434,11 +435,11 @@ elf_machine_rela (struct link_map *map, 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, reloc, reloc_addr, sym_value); + 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, reloc, reloc_addr, sym_value); + elf_machine_fixup_plt (map, 0, 0, 0, reloc, reloc_addr, sym_value); #endif #ifndef RTLD_BOOTSTRAP else if (r_type == R_ALPHA_REFQUAD) |