diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-12-06 19:14:00 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-12-10 19:57:01 -0500 |
| commit | 2bbfaf8abac0854a5b7f5485aa830fec669fa602 (patch) | |
| tree | 914a3a0bbd43298a5fdf20eef3a739d013fc67de | |
| parent | 7a5a6e0718144786c4e0eb7395ede271e57ff4b7 (diff) | |
| download | haskell-2bbfaf8abac0854a5b7f5485aa830fec669fa602.tar.gz | |
hadrian: AArch64 supports the GHCi interpreter and SMP
I'm not sure how this was omitted from the list of supported
architectures.
| -rw-r--r-- | hadrian/src/Oracles/Flag.hs | 2 | ||||
| -rw-r--r-- | hadrian/src/Oracles/Setting.hs | 2 |
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. |