diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2020-11-13 02:51:54 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-11-15 03:36:56 -0500 |
| commit | 8887102fc4ed8ed1089c1aafd19bab424ad706f3 (patch) | |
| tree | e1c3dfc5d2262efbc6dc6ccb902b288766566d90 /rts/linker | |
| parent | 645444af9eb185684c750c95e4740d301352b2b9 (diff) | |
| download | haskell-8887102fc4ed8ed1089c1aafd19bab424ad706f3.tar.gz | |
AArch64/arm64 adjustments
This addes the necessary logic to support aarch64 on elf, as well
as aarch64 on mach-o, which Apple calls arm64.
We change architecture name to AArch64, which is the official arm
naming scheme.
Diffstat (limited to 'rts/linker')
| -rw-r--r-- | rts/linker/elf_plt_aarch64.c | 4 | ||||
| -rw-r--r-- | rts/linker/elf_reloc.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/rts/linker/elf_plt_aarch64.c b/rts/linker/elf_plt_aarch64.c index 6a9d1ddd94..11354a63db 100644 --- a/rts/linker/elf_plt_aarch64.c +++ b/rts/linker/elf_plt_aarch64.c @@ -46,8 +46,8 @@ bool needStubForRelaAarch64(Elf_Rela * rela) { bool makeStubAarch64(Stub * s) { // We (the linker) may corrupt registers x16 (IP0) and x17 (IP1) [AAPCS64] - // and the condition flags, according to the "ELF for the ARM64 - // Architecture". + // and the condition flags, according to the "ELF for the ARM 64-bit + // Architecture (AArch64)". // // [Special purpose regs] // X16 and X17 are IP0 and IP1, intra-procedure-call temporary registers. diff --git a/rts/linker/elf_reloc.c b/rts/linker/elf_reloc.c index 410a23607b..c2271b6e60 100644 --- a/rts/linker/elf_reloc.c +++ b/rts/linker/elf_reloc.c @@ -4,7 +4,7 @@ #if defined(OBJFORMAT_ELF) -/* we currently only use this abstraction for elf/arm64 */ +/* we currently only use this abstraction for elf/aarch64 */ #if defined(aarch64_HOST_ARCH) bool |