summaryrefslogtreecommitdiff
path: root/compiler/cmm
diff options
context:
space:
mode:
Diffstat (limited to 'compiler/cmm')
-rw-r--r--compiler/cmm/Cmm.hs5
-rw-r--r--compiler/cmm/CmmBuildInfoTables.hs4
-rw-r--r--compiler/cmm/CmmLayoutStack.hs3
-rw-r--r--compiler/cmm/CmmLint.hs3
-rw-r--r--compiler/cmm/CmmNode.hs6
-rw-r--r--compiler/cmm/CmmProcPoint.hs3
-rw-r--r--compiler/cmm/CmmUtils.hs5
-rw-r--r--compiler/cmm/Hoopl.hs3
-rw-r--r--compiler/cmm/Hoopl/Dataflow.hs7
-rw-r--r--compiler/cmm/PprC.hs4
10 files changed, 0 insertions, 43 deletions
diff --git a/compiler/cmm/Cmm.hs b/compiler/cmm/Cmm.hs
index 1c77409e49..315e582878 100644
--- a/compiler/cmm/Cmm.hs
+++ b/compiler/cmm/Cmm.hs
@@ -1,11 +1,6 @@
-- Cmm representations using Hoopl's Graph CmmNode e x.
{-# LANGUAGE GADTs #-}
{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}
-{-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}
-#if __GLASGOW_HASKELL__ >= 703
--- GHC 7.0.1 improved incomplete pattern warnings with GADTs
-{-# OPTIONS_GHC -fwarn-incomplete-patterns #-}
-#endif
module Cmm (
-- * Cmm top-level datatypes
diff --git a/compiler/cmm/CmmBuildInfoTables.hs b/compiler/cmm/CmmBuildInfoTables.hs
index 651cc6f40f..285fe8fa33 100644
--- a/compiler/cmm/CmmBuildInfoTables.hs
+++ b/compiler/cmm/CmmBuildInfoTables.hs
@@ -48,11 +48,7 @@ import qualified Data.Set as Set
import Control.Monad
foldSet :: (a -> b -> b) -> b -> Set a -> b
-#if __GLASGOW_HASKELL__ < 704
-foldSet = Set.fold
-#else
foldSet = Set.foldr
-#endif
----------------------------------------------------------------
-- Building InfoTables
diff --git a/compiler/cmm/CmmLayoutStack.hs b/compiler/cmm/CmmLayoutStack.hs
index d45c4d8546..209ef8f8fd 100644
--- a/compiler/cmm/CmmLayoutStack.hs
+++ b/compiler/cmm/CmmLayoutStack.hs
@@ -1,7 +1,4 @@
{-# LANGUAGE RecordWildCards, GADTs #-}
-#if __GLASGOW_HASKELL__ < 701
-{-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}
-#endif
module CmmLayoutStack (
cmmLayoutStack, setInfoTableStackMap
) where
diff --git a/compiler/cmm/CmmLint.hs b/compiler/cmm/CmmLint.hs
index e4bc308c22..2e24dd7f82 100644
--- a/compiler/cmm/CmmLint.hs
+++ b/compiler/cmm/CmmLint.hs
@@ -6,9 +6,6 @@
--
-----------------------------------------------------------------------------
{-# LANGUAGE GADTs #-}
-#if __GLASGOW_HASKELL__ < 701
-{-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}
-#endif
module CmmLint (
cmmLint, cmmLintGraph
) where
diff --git a/compiler/cmm/CmmNode.hs b/compiler/cmm/CmmNode.hs
index 0a5f5170f0..702e2eb786 100644
--- a/compiler/cmm/CmmNode.hs
+++ b/compiler/cmm/CmmNode.hs
@@ -8,12 +8,6 @@
-- http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#TabsvsSpaces
-- for details
-{-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}
-#if __GLASGOW_HASKELL__ >= 703
--- GHC 7.0.1 improved incomplete pattern warnings with GADTs
-{-# OPTIONS_GHC -fwarn-incomplete-patterns #-}
-#endif
-
module CmmNode (
CmmNode(..), ForeignHint(..), CmmFormal, CmmActual,
UpdFrameOffset, Convention(..), ForeignConvention(..), ForeignTarget(..),
diff --git a/compiler/cmm/CmmProcPoint.hs b/compiler/cmm/CmmProcPoint.hs
index 51b2845297..ebe40d9c9e 100644
--- a/compiler/cmm/CmmProcPoint.hs
+++ b/compiler/cmm/CmmProcPoint.hs
@@ -1,8 +1,5 @@
{-# LANGUAGE GADTs, DisambiguateRecordFields #-}
{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}
-#if __GLASGOW_HASKELL__ < 701
-{-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}
-#endif
module CmmProcPoint
( ProcPointSet, Status(..)
diff --git a/compiler/cmm/CmmUtils.hs b/compiler/cmm/CmmUtils.hs
index f2e4d8e183..615e2fd625 100644
--- a/compiler/cmm/CmmUtils.hs
+++ b/compiler/cmm/CmmUtils.hs
@@ -8,11 +8,6 @@
{-# OPTIONS_GHC -fno-warn-deprecations #-}
-- Warnings from deprecated blockToNodeList
-{-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}
-#if __GLASGOW_HASKELL__ >= 703
--- GHC 7.0.1 improved incomplete pattern warnings with GADTs
-{-# OPTIONS_GHC -fwarn-incomplete-patterns #-}
-#endif
-----------------------------------------------------------------------------
diff --git a/compiler/cmm/Hoopl.hs b/compiler/cmm/Hoopl.hs
index 1d69be4611..08d95b5073 100644
--- a/compiler/cmm/Hoopl.hs
+++ b/compiler/cmm/Hoopl.hs
@@ -1,6 +1,3 @@
-#if __GLASGOW_HASKELL__ < 701
-{-# OPTIONS_GHC -fno-warn-duplicate-exports #-}
-#endif
module Hoopl (
module Compiler.Hoopl,
module Hoopl.Dataflow,
diff --git a/compiler/cmm/Hoopl/Dataflow.hs b/compiler/cmm/Hoopl/Dataflow.hs
index 6b9a1357c5..78b930a20f 100644
--- a/compiler/cmm/Hoopl/Dataflow.hs
+++ b/compiler/cmm/Hoopl/Dataflow.hs
@@ -10,15 +10,8 @@
--
{-# LANGUAGE RankNTypes, ScopedTypeVariables, GADTs, EmptyDataDecls, PatternGuards, TypeFamilies, MultiParamTypeClasses #-}
-#if __GLASGOW_HASKELL__ >= 703
{-# OPTIONS_GHC -fprof-auto-top #-}
-#endif
-#if __GLASGOW_HASKELL__ >= 701
{-# LANGUAGE Trustworthy #-}
-#endif
-#if __GLASGOW_HASKELL__ < 701
-{-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}
-#endif
module Hoopl.Dataflow
( DataflowLattice(..), OldFact(..), NewFact(..), Fact, mkFactBase
diff --git a/compiler/cmm/PprC.hs b/compiler/cmm/PprC.hs
index 6260cfe463..b9e36782d4 100644
--- a/compiler/cmm/PprC.hs
+++ b/compiler/cmm/PprC.hs
@@ -51,12 +51,8 @@ import Data.Word
import System.IO
import qualified Data.Map as Map
-#if __GLASGOW_HASKELL__ >= 703
import Data.Array.Unsafe ( castSTUArray )
import Data.Array.ST hiding ( castSTUArray )
-#else
-import Data.Array.ST
-#endif
-- --------------------------------------------------------------------------
-- Top level