diff options
Diffstat (limited to 'sysdeps/x86_64/dl-machine.h')
| -rw-r--r-- | sysdeps/x86_64/dl-machine.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h index 1942ed5061..58260c7876 100644 --- a/sysdeps/x86_64/dl-machine.h +++ b/sysdeps/x86_64/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. x86-64 version. - Copyright (C) 2001-2018 Free Software Foundation, Inc. + Copyright (C) 2001-2019 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Andreas Jaeger <aj@suse.de>. @@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ + <https://www.gnu.org/licenses/>. */ #ifndef dl_machine_h #define dl_machine_h @@ -347,6 +347,7 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc, /* Set to symbol size plus addend. */ value = sym->st_size; # endif + /* Fall through. */ case R_X86_64_GLOB_DAT: case R_X86_64_JUMP_SLOT: *reloc_addr = value + reloc->r_addend; @@ -460,6 +461,7 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc, /* Set to symbol size plus addend. */ value = sym->st_size; # endif + /* Fall through. */ case R_X86_64_32: value += reloc->r_addend; *(unsigned int *) reloc_addr = value; @@ -510,7 +512,8 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc, # endif case R_X86_64_IRELATIVE: value = map->l_addr + reloc->r_addend; - value = ((ElfW(Addr) (*) (void)) value) (); + if (__glibc_likely (!skip_ifunc)) + value = ((ElfW(Addr) (*) (void)) value) (); *reloc_addr = value; break; default: |