summaryrefslogtreecommitdiff
path: root/compiler/nativeGen
diff options
context:
space:
mode:
authorSylvain Henry <sylvain@haskus.fr>2020-02-18 11:08:48 +0100
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-02-21 20:46:40 -0500
commit240f5bf6f53515535be5bf3ef7632aa69ae21e3e (patch)
treedc7be78ca126c66af0aeb9f7944ebfc0ac5a211c /compiler/nativeGen
parentbe7068a6130f394dcefbcb5d09c2944deca2270d (diff)
downloadhaskell-240f5bf6f53515535be5bf3ef7632aa69ae21e3e.tar.gz
Modules: Driver (#13009)
submodule updates: nofib, haddock
Diffstat (limited to 'compiler/nativeGen')
-rw-r--r--compiler/nativeGen/AsmCodeGen.hs2
-rw-r--r--compiler/nativeGen/BlockLayout.hs2
-rw-r--r--compiler/nativeGen/CFG.hs2
-rw-r--r--compiler/nativeGen/Dwarf.hs2
-rw-r--r--compiler/nativeGen/Instruction.hs2
-rw-r--r--compiler/nativeGen/NCGMonad.hs2
-rw-r--r--compiler/nativeGen/PIC.hs2
-rw-r--r--compiler/nativeGen/PPC/CodeGen.hs2
-rw-r--r--compiler/nativeGen/PPC/Instr.hs2
-rw-r--r--compiler/nativeGen/PPC/Ppr.hs2
-rw-r--r--compiler/nativeGen/PPC/Regs.hs2
-rw-r--r--compiler/nativeGen/PprBase.hs2
-rw-r--r--compiler/nativeGen/RegAlloc/Graph/Main.hs2
-rw-r--r--compiler/nativeGen/RegAlloc/Linear/Base.hs2
-rw-r--r--compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs2
-rw-r--r--compiler/nativeGen/RegAlloc/Linear/JoinToTargets.hs2
-rw-r--r--compiler/nativeGen/RegAlloc/Linear/Main.hs2
-rw-r--r--compiler/nativeGen/RegAlloc/Linear/StackMap.hs2
-rw-r--r--compiler/nativeGen/RegAlloc/Linear/State.hs2
-rw-r--r--compiler/nativeGen/RegAlloc/Liveness.hs2
-rw-r--r--compiler/nativeGen/SPARC/Base.hs2
-rw-r--r--compiler/nativeGen/SPARC/CodeGen.hs2
-rw-r--r--compiler/nativeGen/SPARC/CodeGen/Base.hs2
-rw-r--r--compiler/nativeGen/SPARC/CodeGen/Gen32.hs2
-rw-r--r--compiler/nativeGen/SPARC/CodeGen/Gen64.hs2
-rw-r--r--compiler/nativeGen/SPARC/Instr.hs2
-rw-r--r--compiler/nativeGen/SPARC/Stack.hs2
-rw-r--r--compiler/nativeGen/X86/CodeGen.hs2
-rw-r--r--compiler/nativeGen/X86/Instr.hs2
-rw-r--r--compiler/nativeGen/X86/Ppr.hs2
-rw-r--r--compiler/nativeGen/X86/Regs.hs2
31 files changed, 31 insertions, 31 deletions
diff --git a/compiler/nativeGen/AsmCodeGen.hs b/compiler/nativeGen/AsmCodeGen.hs
index 4653deaab6..9aa6933757 100644
--- a/compiler/nativeGen/AsmCodeGen.hs
+++ b/compiler/nativeGen/AsmCodeGen.hs
@@ -84,7 +84,7 @@ import GHC.Cmm.CLabel
import UniqFM
import UniqSupply
-import DynFlags
+import GHC.Driver.Session
import Util
import BasicTypes ( Alignment )
diff --git a/compiler/nativeGen/BlockLayout.hs b/compiler/nativeGen/BlockLayout.hs
index 3f74065e4e..e488f0908f 100644
--- a/compiler/nativeGen/BlockLayout.hs
+++ b/compiler/nativeGen/BlockLayout.hs
@@ -25,7 +25,7 @@ import GHC.Cmm
import GHC.Cmm.Dataflow.Collections
import GHC.Cmm.Dataflow.Label
-import DynFlags (gopt, GeneralFlag(..), DynFlags, backendMaintainsCfg)
+import GHC.Driver.Session (gopt, GeneralFlag(..), DynFlags, backendMaintainsCfg)
import UniqFM
import Util
import Unique
diff --git a/compiler/nativeGen/CFG.hs b/compiler/nativeGen/CFG.hs
index f5c2a6456f..7e2c2de095 100644
--- a/compiler/nativeGen/CFG.hs
+++ b/compiler/nativeGen/CFG.hs
@@ -78,7 +78,7 @@ import Outputable
--import OrdList
--import GHC.Cmm.DebugBlock.Trace
import GHC.Cmm.Ppr () -- For Outputable instances
-import qualified DynFlags as D
+import qualified GHC.Driver.Session as D
import Data.List (sort, nub, partition)
import Data.STRef.Strict
diff --git a/compiler/nativeGen/Dwarf.hs b/compiler/nativeGen/Dwarf.hs
index a64df287f5..5bd62a7234 100644
--- a/compiler/nativeGen/Dwarf.hs
+++ b/compiler/nativeGen/Dwarf.hs
@@ -9,7 +9,7 @@ import GHC.Cmm.Expr ( GlobalReg(..) )
import Config ( cProjectName, cProjectVersion )
import CoreSyn ( Tickish(..) )
import GHC.Cmm.DebugBlock
-import DynFlags
+import GHC.Driver.Session
import Module
import Outputable
import GHC.Platform
diff --git a/compiler/nativeGen/Instruction.hs b/compiler/nativeGen/Instruction.hs
index ad4937bf08..23c5ced1d8 100644
--- a/compiler/nativeGen/Instruction.hs
+++ b/compiler/nativeGen/Instruction.hs
@@ -21,7 +21,7 @@ import Reg
import GHC.Cmm.BlockId
import GHC.Cmm.Dataflow.Collections
import GHC.Cmm.Dataflow.Label
-import DynFlags
+import GHC.Driver.Session
import GHC.Cmm hiding (topInfoTable)
import GHC.Platform
diff --git a/compiler/nativeGen/NCGMonad.hs b/compiler/nativeGen/NCGMonad.hs
index 849b3fe761..5f2af49d4c 100644
--- a/compiler/nativeGen/NCGMonad.hs
+++ b/compiler/nativeGen/NCGMonad.hs
@@ -58,7 +58,7 @@ import FastString ( FastString )
import UniqFM
import UniqSupply
import Unique ( Unique )
-import DynFlags
+import GHC.Driver.Session
import Module
import Control.Monad ( ap )
diff --git a/compiler/nativeGen/PIC.hs b/compiler/nativeGen/PIC.hs
index 6e0708ab04..5c217f2fe6 100644
--- a/compiler/nativeGen/PIC.hs
+++ b/compiler/nativeGen/PIC.hs
@@ -75,7 +75,7 @@ import Module
import Outputable
-import DynFlags
+import GHC.Driver.Session
import FastString
diff --git a/compiler/nativeGen/PPC/CodeGen.hs b/compiler/nativeGen/PPC/CodeGen.hs
index 4374cbeb8d..ad47501981 100644
--- a/compiler/nativeGen/PPC/CodeGen.hs
+++ b/compiler/nativeGen/PPC/CodeGen.hs
@@ -54,7 +54,7 @@ import GHC.Cmm.Dataflow.Graph
-- The rest:
import OrdList
import Outputable
-import DynFlags
+import GHC.Driver.Session
import Control.Monad ( mapAndUnzipM, when )
import Data.Bits
diff --git a/compiler/nativeGen/PPC/Instr.hs b/compiler/nativeGen/PPC/Instr.hs
index 2dff3349fb..ad2039d463 100644
--- a/compiler/nativeGen/PPC/Instr.hs
+++ b/compiler/nativeGen/PPC/Instr.hs
@@ -38,7 +38,7 @@ import GHC.Platform.Regs
import GHC.Cmm.BlockId
import GHC.Cmm.Dataflow.Collections
import GHC.Cmm.Dataflow.Label
-import DynFlags
+import GHC.Driver.Session
import GHC.Cmm
import GHC.Cmm.Info
import FastString
diff --git a/compiler/nativeGen/PPC/Ppr.hs b/compiler/nativeGen/PPC/Ppr.hs
index 5ede19bd5e..8b81274db9 100644
--- a/compiler/nativeGen/PPC/Ppr.hs
+++ b/compiler/nativeGen/PPC/Ppr.hs
@@ -33,7 +33,7 @@ import Unique ( pprUniqueAlways, getUnique )
import GHC.Platform
import FastString
import Outputable
-import DynFlags
+import GHC.Driver.Session
import Data.Word
import Data.Int
diff --git a/compiler/nativeGen/PPC/Regs.hs b/compiler/nativeGen/PPC/Regs.hs
index 66aa006311..ff3ec639be 100644
--- a/compiler/nativeGen/PPC/Regs.hs
+++ b/compiler/nativeGen/PPC/Regs.hs
@@ -60,7 +60,7 @@ import GHC.Cmm.CLabel ( CLabel )
import Unique
import GHC.Platform.Regs
-import DynFlags
+import GHC.Driver.Session
import Outputable
import GHC.Platform
diff --git a/compiler/nativeGen/PprBase.hs b/compiler/nativeGen/PprBase.hs
index c5574b35f0..dc6e65bd70 100644
--- a/compiler/nativeGen/PprBase.hs
+++ b/compiler/nativeGen/PprBase.hs
@@ -25,7 +25,7 @@ import GhcPrelude
import AsmUtils
import GHC.Cmm.CLabel
import GHC.Cmm
-import DynFlags
+import GHC.Driver.Session
import FastString
import Outputable
import GHC.Platform
diff --git a/compiler/nativeGen/RegAlloc/Graph/Main.hs b/compiler/nativeGen/RegAlloc/Graph/Main.hs
index 177a73bf81..6b2758f723 100644
--- a/compiler/nativeGen/RegAlloc/Graph/Main.hs
+++ b/compiler/nativeGen/RegAlloc/Graph/Main.hs
@@ -20,7 +20,7 @@ import RegClass
import Reg
import Bag
-import DynFlags
+import GHC.Driver.Session
import Outputable
import GHC.Platform
import UniqFM
diff --git a/compiler/nativeGen/RegAlloc/Linear/Base.hs b/compiler/nativeGen/RegAlloc/Linear/Base.hs
index 3c6965c1dd..552f14929d 100644
--- a/compiler/nativeGen/RegAlloc/Linear/Base.hs
+++ b/compiler/nativeGen/RegAlloc/Linear/Base.hs
@@ -23,7 +23,7 @@ import RegAlloc.Linear.StackMap
import RegAlloc.Liveness
import Reg
-import DynFlags
+import GHC.Driver.Session
import Outputable
import Unique
import UniqFM
diff --git a/compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs b/compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs
index 0feddc67d8..b2b9cff5bb 100644
--- a/compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs
+++ b/compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs
@@ -14,7 +14,7 @@ import GhcPrelude
import Reg
import RegClass
-import DynFlags
+import GHC.Driver.Session
import Panic
import GHC.Platform
diff --git a/compiler/nativeGen/RegAlloc/Linear/JoinToTargets.hs b/compiler/nativeGen/RegAlloc/Linear/JoinToTargets.hs
index d0710cb65f..4362ca8a17 100644
--- a/compiler/nativeGen/RegAlloc/Linear/JoinToTargets.hs
+++ b/compiler/nativeGen/RegAlloc/Linear/JoinToTargets.hs
@@ -22,7 +22,7 @@ import Reg
import GHC.Cmm.BlockId
import GHC.Cmm.Dataflow.Collections
import Digraph
-import DynFlags
+import GHC.Driver.Session
import Outputable
import Unique
import UniqFM
diff --git a/compiler/nativeGen/RegAlloc/Linear/Main.hs b/compiler/nativeGen/RegAlloc/Linear/Main.hs
index 7a3b1ef902..076b63a4ed 100644
--- a/compiler/nativeGen/RegAlloc/Linear/Main.hs
+++ b/compiler/nativeGen/RegAlloc/Linear/Main.hs
@@ -126,7 +126,7 @@ import GHC.Cmm.Dataflow.Collections
import GHC.Cmm hiding (RegSet)
import Digraph
-import DynFlags
+import GHC.Driver.Session
import Unique
import UniqSet
import UniqFM
diff --git a/compiler/nativeGen/RegAlloc/Linear/StackMap.hs b/compiler/nativeGen/RegAlloc/Linear/StackMap.hs
index 95819c6fb3..79496c6e43 100644
--- a/compiler/nativeGen/RegAlloc/Linear/StackMap.hs
+++ b/compiler/nativeGen/RegAlloc/Linear/StackMap.hs
@@ -22,7 +22,7 @@ where
import GhcPrelude
-import DynFlags
+import GHC.Driver.Session
import UniqFM
import Unique
diff --git a/compiler/nativeGen/RegAlloc/Linear/State.hs b/compiler/nativeGen/RegAlloc/Linear/State.hs
index d24690f04c..9e5efa5f7f 100644
--- a/compiler/nativeGen/RegAlloc/Linear/State.hs
+++ b/compiler/nativeGen/RegAlloc/Linear/State.hs
@@ -46,7 +46,7 @@ import Instruction
import Reg
import GHC.Cmm.BlockId
-import DynFlags
+import GHC.Driver.Session
import Unique
import UniqSupply
diff --git a/compiler/nativeGen/RegAlloc/Liveness.hs b/compiler/nativeGen/RegAlloc/Liveness.hs
index e1bbb467d0..b6fd3b3937 100644
--- a/compiler/nativeGen/RegAlloc/Liveness.hs
+++ b/compiler/nativeGen/RegAlloc/Liveness.hs
@@ -49,7 +49,7 @@ import GHC.Cmm.Dataflow.Label
import GHC.Cmm hiding (RegSet, emptyRegSet)
import Digraph
-import DynFlags
+import GHC.Driver.Session
import MonadUtils
import Outputable
import GHC.Platform
diff --git a/compiler/nativeGen/SPARC/Base.hs b/compiler/nativeGen/SPARC/Base.hs
index 04e8fed2b3..4b3b7c984c 100644
--- a/compiler/nativeGen/SPARC/Base.hs
+++ b/compiler/nativeGen/SPARC/Base.hs
@@ -20,7 +20,7 @@ where
import GhcPrelude
-import DynFlags
+import GHC.Driver.Session
import Panic
import Data.Int
diff --git a/compiler/nativeGen/SPARC/CodeGen.hs b/compiler/nativeGen/SPARC/CodeGen.hs
index 60cfd91de9..b9f79a6b9f 100644
--- a/compiler/nativeGen/SPARC/CodeGen.hs
+++ b/compiler/nativeGen/SPARC/CodeGen.hs
@@ -52,7 +52,7 @@ import CPrim
-- The rest:
import BasicTypes
-import DynFlags
+import GHC.Driver.Session
import FastString
import OrdList
import Outputable
diff --git a/compiler/nativeGen/SPARC/CodeGen/Base.hs b/compiler/nativeGen/SPARC/CodeGen/Base.hs
index 4497e1bd5d..ba07f2311d 100644
--- a/compiler/nativeGen/SPARC/CodeGen/Base.hs
+++ b/compiler/nativeGen/SPARC/CodeGen/Base.hs
@@ -23,7 +23,7 @@ import Format
import Reg
import GHC.Platform.Regs
-import DynFlags
+import GHC.Driver.Session
import GHC.Cmm
import GHC.Cmm.Ppr.Expr () -- For Outputable instances
import GHC.Platform
diff --git a/compiler/nativeGen/SPARC/CodeGen/Gen32.hs b/compiler/nativeGen/SPARC/CodeGen/Gen32.hs
index 01f133ed8f..4f3409ebc5 100644
--- a/compiler/nativeGen/SPARC/CodeGen/Gen32.hs
+++ b/compiler/nativeGen/SPARC/CodeGen/Gen32.hs
@@ -26,7 +26,7 @@ import Reg
import GHC.Cmm
import Control.Monad (liftM)
-import DynFlags
+import GHC.Driver.Session
import OrdList
import Outputable
diff --git a/compiler/nativeGen/SPARC/CodeGen/Gen64.hs b/compiler/nativeGen/SPARC/CodeGen/Gen64.hs
index a267cd22ab..7c04101ec4 100644
--- a/compiler/nativeGen/SPARC/CodeGen/Gen64.hs
+++ b/compiler/nativeGen/SPARC/CodeGen/Gen64.hs
@@ -24,7 +24,7 @@ import Reg
import GHC.Cmm
-import DynFlags
+import GHC.Driver.Session
import OrdList
import Outputable
diff --git a/compiler/nativeGen/SPARC/Instr.hs b/compiler/nativeGen/SPARC/Instr.hs
index 7b4935802b..d49d82fa7e 100644
--- a/compiler/nativeGen/SPARC/Instr.hs
+++ b/compiler/nativeGen/SPARC/Instr.hs
@@ -41,7 +41,7 @@ import Format
import GHC.Cmm.CLabel
import GHC.Platform.Regs
import GHC.Cmm.BlockId
-import DynFlags
+import GHC.Driver.Session
import GHC.Cmm
import FastString
import Outputable
diff --git a/compiler/nativeGen/SPARC/Stack.hs b/compiler/nativeGen/SPARC/Stack.hs
index 3f5b2a7289..2553c6135d 100644
--- a/compiler/nativeGen/SPARC/Stack.hs
+++ b/compiler/nativeGen/SPARC/Stack.hs
@@ -14,7 +14,7 @@ import SPARC.Regs
import SPARC.Base
import SPARC.Imm
-import DynFlags
+import GHC.Driver.Session
import Outputable
-- | Get an AddrMode relative to the address in sp.
diff --git a/compiler/nativeGen/X86/CodeGen.hs b/compiler/nativeGen/X86/CodeGen.hs
index d60231f7b2..26797949f4 100644
--- a/compiler/nativeGen/X86/CodeGen.hs
+++ b/compiler/nativeGen/X86/CodeGen.hs
@@ -79,7 +79,7 @@ import ForeignCall ( CCallConv(..) )
import OrdList
import Outputable
import FastString
-import DynFlags
+import GHC.Driver.Session
import Util
import UniqSupply ( getUniqueM )
diff --git a/compiler/nativeGen/X86/Instr.hs b/compiler/nativeGen/X86/Instr.hs
index 422bb96de4..099437265c 100644
--- a/compiler/nativeGen/X86/Instr.hs
+++ b/compiler/nativeGen/X86/Instr.hs
@@ -37,7 +37,7 @@ import GHC.Platform
import BasicTypes (Alignment)
import GHC.Cmm.CLabel
-import DynFlags
+import GHC.Driver.Session
import UniqSet
import Unique
import UniqSupply
diff --git a/compiler/nativeGen/X86/Ppr.hs b/compiler/nativeGen/X86/Ppr.hs
index 4df7287b5a..4abc15cedd 100644
--- a/compiler/nativeGen/X86/Ppr.hs
+++ b/compiler/nativeGen/X86/Ppr.hs
@@ -36,7 +36,7 @@ import PprBase
import GHC.Cmm.Dataflow.Collections
import GHC.Cmm.Dataflow.Label
import BasicTypes (Alignment, mkAlignment, alignmentBytes)
-import DynFlags
+import GHC.Driver.Session
import GHC.Cmm hiding (topInfoTable)
import GHC.Cmm.BlockId
import GHC.Cmm.CLabel
diff --git a/compiler/nativeGen/X86/Regs.hs b/compiler/nativeGen/X86/Regs.hs
index 44f92017a1..4c8943a284 100644
--- a/compiler/nativeGen/X86/Regs.hs
+++ b/compiler/nativeGen/X86/Regs.hs
@@ -57,7 +57,7 @@ import RegClass
import GHC.Cmm
import GHC.Cmm.CLabel ( CLabel )
-import DynFlags
+import GHC.Driver.Session
import Outputable
import GHC.Platform
View Lorry Controller Status