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 /libraries/ghci | |
| 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 'libraries/ghci')
| -rw-r--r-- | libraries/ghci/GHCi/InfoTable.hsc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libraries/ghci/GHCi/InfoTable.hsc b/libraries/ghci/GHCi/InfoTable.hsc index b3f3c16332..3495403183 100644 --- a/libraries/ghci/GHCi/InfoTable.hsc +++ b/libraries/ghci/GHCi/InfoTable.hsc @@ -69,7 +69,7 @@ data Arch = ArchSPARC | ArchX86_64 | ArchAlpha | ArchARM - | ArchARM64 + | ArchAArch64 | ArchPPC64 | ArchPPC64LE | ArchS390X @@ -102,7 +102,7 @@ mArch = #elif defined(arm_HOST_ARCH) Just ArchARM #elif defined(aarch64_HOST_ARCH) - Just ArchARM64 + Just ArchAArch64 #elif defined(powerpc64_HOST_ARCH) Just ArchPPC64 #elif defined(powerpc64le_HOST_ARCH) @@ -214,7 +214,7 @@ mkJumpToAddr' platform a = case platform of , 0x11, 0xff, 0x2f, 0xe1 , byte0 w32, byte1 w32, byte2 w32, byte3 w32] - ArchARM64 { } -> + ArchAArch64 { } -> -- Generates: -- -- ldr x1, label |