diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:01:57 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:01:57 +0000 |
| commit | cab56836b146bc129f1ad43f0393d95a9deca63a (patch) | |
| tree | 4f4e655319bbac78fca170da05275c127429b460 /sysdeps/generic/dl-machine.h | |
| parent | 04ac1241a4cd004872282c2c82ec37fa33925292 (diff) | |
| parent | 82dd75a7f436a19047325d62182590c9f9e23a78 (diff) | |
Merge branch 't/tls' into refs/top-bases/t/tls-threadvar
Diffstat (limited to 'sysdeps/generic/dl-machine.h')
| -rw-r--r-- | sysdeps/generic/dl-machine.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sysdeps/generic/dl-machine.h b/sysdeps/generic/dl-machine.h index 041c99e221..fc0f2141f5 100644 --- a/sysdeps/generic/dl-machine.h +++ b/sysdeps/generic/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. Stub version. - Copyright (C) 1995-2016 Free Software Foundation, Inc. + Copyright (C) 1995-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -51,10 +51,11 @@ elf_machine_load_address (void) /* Fixup a PLT entry to bounce directly to the function at VALUE. */ -static inline Elf32_Addr +static inline ElfW(Addr) elf_machine_fixup_plt (struct link_map *map, lookup_t t, - const Elf32_Rel *reloc, - Elf32_Addr *reloc_addr, Elf32_Addr value) + const ElfW(Sym) *refsym, const ElfW(Sym) *sym, + const ElfW(Rel) *reloc, + ElfW(Addr) *reloc_addr, ElfW(Addr) value) { return *reloc_addr = value; } |