diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/aarch64/bits/link.h | 6 | ||||
| -rw-r--r-- | sysdeps/aarch64/dl-machine.h | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 40cd918931..3fd08436cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ 2014-11-21 Will Newton <will.newton@linaro.org> Andrew Pinski <andrew.pinski@caviumnetworks.com> + * sysdeps/aarch64/bits/link.h (la_aarch64_gnu_pltenter): Use + ElfW macro instead of hardcoded Elf64 types. + (la_aarch64_gnu_pltenter): Likewise. + * sysdeps/aarch64/dl-machine.h + (elf_machine_runtime_setup): Use ElfW(Addr). + * elf/elf.h (R_AARCH64_P32_ABS32, R_AARCH64_P32_COPY, R_AARCH64_P32_GLOB_DAT, R_AARCH64_P32_JUMP_SLOT, R_AARCH64_P32_RELATIVE, R_AARCH64_P32_TLS_DTPMOD, diff --git a/sysdeps/aarch64/bits/link.h b/sysdeps/aarch64/bits/link.h index fe068276ea..3a84a18b52 100644 --- a/sysdeps/aarch64/bits/link.h +++ b/sysdeps/aarch64/bits/link.h @@ -40,8 +40,8 @@ typedef struct La_aarch64_retval } La_aarch64_retval; __BEGIN_DECLS -extern Elf64_Addr -la_aarch64_gnu_pltenter (Elf64_Sym *__sym, unsigned int __ndx, +extern ElfW(Addr) +la_aarch64_gnu_pltenter (ElfW(Sym) *__sym, unsigned int __ndx, uintptr_t *__refcook, uintptr_t *__defcook, La_aarch64_regs *__regs, @@ -50,7 +50,7 @@ la_aarch64_gnu_pltenter (Elf64_Sym *__sym, unsigned int __ndx, long int *__framesizep); extern unsigned int -la_aarch64_gnu_pltexit (Elf64_Sym *__sym, unsigned int __ndx, +la_aarch64_gnu_pltexit (ElfW(Sym) *__sym, unsigned int __ndx, uintptr_t *__refcook, uintptr_t *__defcook, const La_aarch64_regs *__inregs, diff --git a/sysdeps/aarch64/dl-machine.h b/sysdeps/aarch64/dl-machine.h index acb090d817..7f5ce2b671 100644 --- a/sysdeps/aarch64/dl-machine.h +++ b/sysdeps/aarch64/dl-machine.h @@ -113,8 +113,8 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) } if (l->l_info[ADDRIDX (DT_TLSDESC_GOT)] && lazy) - *(Elf64_Addr*)(D_PTR (l, l_info[ADDRIDX (DT_TLSDESC_GOT)]) + l->l_addr) - = (Elf64_Addr) &_dl_tlsdesc_resolve_rela; + *(ElfW(Addr)*)(D_PTR (l, l_info[ADDRIDX (DT_TLSDESC_GOT)]) + l->l_addr) + = (ElfW(Addr)) &_dl_tlsdesc_resolve_rela; return lazy; } |