summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2019-12-06 19:14:00 -0500
committerBen Gamari <ben@smart-cactus.org>2019-12-09 21:03:33 -0500
commit55010ef92e6803d553161dd36b4c9e583c30e478 (patch)
treeff3916100c195e90a528ec16bebf823ac9e431a3
parentf171b3582d44746bf8b08897a3b23bc97e5dbdda (diff)
downloadhaskell-wip/hadrian/aarch64-ghci.tar.gz
hadrian: AArch64 supports the GHCi interpreter and SMPwip/hadrian/aarch64-ghci
I'm not sure how this was omitted from the list of supported architectures.
-rw-r--r--hadrian/src/Oracles/Flag.hs2
-rw-r--r--hadrian/src/Oracles/Setting.hs2
2 files changed, 2 insertions, 2 deletions
diff --git a/hadrian/src/Oracles/Flag.hs b/hadrian/src/Oracles/Flag.hs
index 90b25eef42..c5c5360422 100644
--- a/hadrian/src/Oracles/Flag.hs
+++ b/hadrian/src/Oracles/Flag.hs
@@ -64,7 +64,7 @@ targetSupportsSMP :: Action Bool
targetSupportsSMP = do
unreg <- flag GhcUnregisterised
armVer <- targetArmVersion
- goodArch <- anyTargetArch ["i386", "x86_64", "sparc", "powerpc", "arm", "s390x"]
+ goodArch <- anyTargetArch ["i386", "x86_64", "sparc", "powerpc", "arm", "aarch64", "s390x"]
if -- The THREADED_RTS requires `BaseReg` to be in a register and the
-- Unregisterised mode doesn't allow that.
| unreg -> return False
diff --git a/hadrian/src/Oracles/Setting.hs b/hadrian/src/Oracles/Setting.hs
index 569d9a4ed4..632d783e9a 100644
--- a/hadrian/src/Oracles/Setting.hs
+++ b/hadrian/src/Oracles/Setting.hs
@@ -242,7 +242,7 @@ ghcWithInterpreter = do
, "freebsd", "dragonfly", "netbsd", "openbsd"
, "darwin", "kfreebsdgnu" ]
goodArch <- anyTargetArch [ "i386", "x86_64", "powerpc", "sparc"
- , "sparc64", "arm", "s390x" ]
+ , "sparc64", "arm", "aarch64", "s390x" ]
return $ goodOs && goodArch
-- | Check to use @libffi@ for adjustors.