diff options
Diffstat (limited to 'compiler/GHC/Driver/Config')
| -rw-r--r-- | compiler/GHC/Driver/Config/Cmm.hs | 2 | ||||
| -rw-r--r-- | compiler/GHC/Driver/Config/StgToCmm.hs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/compiler/GHC/Driver/Config/Cmm.hs b/compiler/GHC/Driver/Config/Cmm.hs index 38bab62048..d7280b0e60 100644 --- a/compiler/GHC/Driver/Config/Cmm.hs +++ b/compiler/GHC/Driver/Config/Cmm.hs @@ -22,7 +22,7 @@ initCmmConfig dflags = CmmConfig , cmmGenStackUnwindInstr = debugLevel dflags > 0 , cmmExternalDynamicRefs = gopt Opt_ExternalDynamicRefs dflags , cmmDoCmmSwitchPlans = not . backendSupportsSwitch . backend $ dflags - , cmmSplitProcPoints = (backend dflags /= NCG) + , cmmSplitProcPoints = (backend dflags /= Just NCG) || not (platformTablesNextToCode platform) || usingInconsistentPicReg } diff --git a/compiler/GHC/Driver/Config/StgToCmm.hs b/compiler/GHC/Driver/Config/StgToCmm.hs index ae59e41fdf..0476c0e684 100644 --- a/compiler/GHC/Driver/Config/StgToCmm.hs +++ b/compiler/GHC/Driver/Config/StgToCmm.hs @@ -58,8 +58,8 @@ initStgToCmmConfig dflags mod = StgToCmmConfig } where profile = targetProfile dflags platform = profilePlatform profile bk_end = backend dflags - ncg = bk_end == NCG - llvm = bk_end == LLVM + ncg = bk_end == Just NCG + llvm = bk_end == Just LLVM x86ish = case platformArch platform of ArchX86 -> True ArchX86_64 -> True @@ -70,5 +70,5 @@ initStgToCmmConfig dflags mod = StgToCmmConfig _ -> False aarch64 = platformArch platform == ArchAArch64 vec_err = case backend dflags of - LLVM -> Nothing - _ -> Just (unlines ["SIMD vector instructions require the LLVM back-end.", "Please use -fllvm."]) + Just LLVM -> Nothing + _ -> Just (unlines ["SIMD vector instructions require the LLVM back-end.", "Please use -fllvm."]) |