diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2017-09-09 10:53:56 +0200 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2017-09-09 10:53:56 +0200 |
| commit | cf6b4d1c603c0e81eeae8d4e4d8025e84ca5d63b (patch) | |
| tree | fdb13efd637c7753534ec995d1171910a6db3080 /compiler/prelude | |
| parent | 22f11f1975ba5bfa6934a32cc8922491cb7f494d (diff) | |
| download | haskell-cf6b4d1c603c0e81eeae8d4e4d8025e84ca5d63b.tar.gz | |
Remove now redundant CPP
Resulting from requiring to boot with GHC 8.0 or later
Diffstat (limited to 'compiler/prelude')
| -rw-r--r-- | compiler/prelude/PrelRules.hs | 4 | ||||
| -rw-r--r-- | compiler/prelude/PrimOp.hs | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/compiler/prelude/PrelRules.hs b/compiler/prelude/PrelRules.hs index 8ee0f828ed..13f4f12736 100644 --- a/compiler/prelude/PrelRules.hs +++ b/compiler/prelude/PrelRules.hs @@ -56,9 +56,7 @@ import Coercion (mkUnbranchedAxInstCo,mkSymCo,Role(..)) import Control.Applicative ( Alternative(..) ) import Control.Monad -#if __GLASGOW_HASKELL__ > 710 import qualified Control.Monad.Fail as MonadFail -#endif import Data.Bits as Bits import qualified Data.ByteString as BS import Data.Int @@ -651,10 +649,8 @@ instance Monad RuleM where Just r -> runRuleM (g r) dflags iu e fail _ = mzero -#if __GLASGOW_HASKELL__ > 710 instance MonadFail.MonadFail RuleM where fail _ = mzero -#endif instance Alternative RuleM where empty = RuleM $ \_ _ _ -> Nothing diff --git a/compiler/prelude/PrimOp.hs b/compiler/prelude/PrimOp.hs index 3a849060ff..79bec86d00 100644 --- a/compiler/prelude/PrimOp.hs +++ b/compiler/prelude/PrimOp.hs @@ -7,9 +7,7 @@ {-# LANGUAGE CPP #-} -- The default is a bit too low for the quite large primOpInfo definition -#if __GLASGOW_HASKELL__ >= 801 {-# OPTIONS_GHC -fmax-pmcheck-iterations=10000000 #-} -#endif module PrimOp ( PrimOp(..), PrimOpVecCat(..), allThePrimOps, |