diff mbox

[2/3] AArch64: Use ELF macros rather than Elf64 throughout

Message ID 1416329010-8683-3-git-send-email-will.newton@linaro.org
State New
Headers show

Commit Message

Will Newton Nov. 18, 2014, 4:43 p.m. UTC 
Using the macros for ELF types is required for adding ILP32 support.
In the standard AArch64 configuration this makes no difference to
the types used.

ChangeLog:

2014-11-18  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).
---
 sysdeps/aarch64/bits/link.h  | 6 +++---
 sysdeps/aarch64/dl-machine.h | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

Comments

Marcus Shawcroft Nov. 21, 2014, 2:37 p.m. UTC | #1 
On 18 November 2014 16:43, Will Newton <will.newton@linaro.org> wrote:
> Using the macros for ELF types is required for adding ILP32 support.
> In the standard AArch64 configuration this makes no difference to
> the types used.
>
> ChangeLog:
>
> 2014-11-18  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).

OK /Marcus
diff mbox

Patch

diff --git a/sysdeps/aarch64/bits/link.h b/sysdeps/aarch64/bits/link.h
index fe06827..3a84a18 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 acb090d..7f5ce2b 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;
 }