summaryrefslogtreecommitdiff
path: root/compiler/GHC/Platform.hs
diff options
context:
space:
mode:
authorMoritz Angermann <moritz.angermann@gmail.com>2020-11-13 02:51:54 +0000
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-11-15 03:36:56 -0500
commit8887102fc4ed8ed1089c1aafd19bab424ad706f3 (patch)
treee1c3dfc5d2262efbc6dc6ccb902b288766566d90 /compiler/GHC/Platform.hs
parent645444af9eb185684c750c95e4740d301352b2b9 (diff)
downloadhaskell-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 'compiler/GHC/Platform.hs')
-rw-r--r--compiler/GHC/Platform.hs3
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/GHC/Platform.hs b/compiler/GHC/Platform.hs
index 09c6ef37aa..858d5a4101 100644
--- a/compiler/GHC/Platform.hs
+++ b/compiler/GHC/Platform.hs
@@ -109,7 +109,7 @@ platformOS platform = case platformArchOS platform of
isARM :: Arch -> Bool
isARM (ArchARM {}) = True
-isARM ArchARM64 = True
+isARM ArchAArch64 = True
isARM _ = False
-- | This predicate tells us whether the platform is 32-bit.
@@ -232,4 +232,3 @@ platformSOExt platform
OSDarwin -> "dylib"
OSMinGW32 -> "dll"
_ -> "so"
-