diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-07-27 17:42:41 +0100 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2022-07-27 17:42:41 +0100 |
| commit | bdafad27150d58b80f3db56c01f3700cd606c598 (patch) | |
| tree | dfa352db66c95572967a3a5a2add177c39a24b1e | |
| parent | 25c24535ad51aa22b9cae425c6ac4ad9a8f1e1e9 (diff) | |
| download | haskell-wip/testsuite-unreg.tar.gz | |
testsuite: Correctly set withNativeCodeGenwip/testsuite-unreg
Fixes #21918
| -rw-r--r-- | hadrian/src/Settings/Builders/RunTest.hs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hadrian/src/Settings/Builders/RunTest.hs b/hadrian/src/Settings/Builders/RunTest.hs index f6b40d4065..9118efe511 100644 --- a/hadrian/src/Settings/Builders/RunTest.hs +++ b/hadrian/src/Settings/Builders/RunTest.hs @@ -97,7 +97,6 @@ inTreeCompilerArgs stg = do leadingUnderscore <- flag LeadingUnderscore -- MP: This setting seems to only dictate whether we turn on optasm as a compiler -- way, but a lot of tests which use only_ways(optasm) seem to not test the NCG? - withNativeCodeGen <- return True withInterpreter <- ghcWithInterpreter unregisterised <- flag GhcUnregisterised withSMP <- targetSupportsSMP @@ -106,6 +105,11 @@ inTreeCompilerArgs stg = do os <- setting HostOs arch <- setting TargetArch + let codegen_arches = ["x86_64", "i386", "powerpc", "powerpc64", "powerpc64le", "aarch64"] + let withNativeCodeGen + | unregisterised = False + | arch `elem` codegen_arches = True + | otherwise = False platform <- setting TargetPlatform wordsize <- (show @Int . (*8) . read) <$> setting TargetWordSize |