summaryrefslogtreecommitdiff
path: root/compiler/nativeGen/X86
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2019-05-30 20:06:24 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-06-19 22:16:16 -0400
commitbff2f24ba9104275c665b6a0cf30a8dd18407392 (patch)
treeec8f3bc21dfc3e8bb09ec69d82ac499d12489093 /compiler/nativeGen/X86
parent3ae23992786c7ea3211ab6f13e1d61a5edfe5952 (diff)
downloadhaskell-bff2f24ba9104275c665b6a0cf30a8dd18407392.tar.gz
Move 'Platform' to ghc-boot
ghc-pkg needs to be aware of platforms so it can figure out which subdire within the user package db to use. This is admittedly roundabout, but maybe Cabal could use the same notion of a platform as GHC to good affect too.
Diffstat (limited to 'compiler/nativeGen/X86')
-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/RegInfo.hs2
-rw-r--r--compiler/nativeGen/X86/Regs.hs2
5 files changed, 5 insertions, 5 deletions
diff --git a/compiler/nativeGen/X86/CodeGen.hs b/compiler/nativeGen/X86/CodeGen.hs
index 21e18ee6fd..73cfb28d46 100644
--- a/compiler/nativeGen/X86/CodeGen.hs
+++ b/compiler/nativeGen/X86/CodeGen.hs
@@ -54,7 +54,7 @@ import NCGMonad ( NatM, getNewRegNat, getNewLabelNat, setDeltaNat
import CFG
import Format
import Reg
-import Platform
+import GHC.Platform
-- Our intermediate code:
import BasicTypes
diff --git a/compiler/nativeGen/X86/Instr.hs b/compiler/nativeGen/X86/Instr.hs
index 0e69d421a3..6e5d656beb 100644
--- a/compiler/nativeGen/X86/Instr.hs
+++ b/compiler/nativeGen/X86/Instr.hs
@@ -34,7 +34,7 @@ import CodeGen.Platform
import Cmm
import FastString
import Outputable
-import Platform
+import GHC.Platform
import BasicTypes (Alignment)
import CLabel
diff --git a/compiler/nativeGen/X86/Ppr.hs b/compiler/nativeGen/X86/Ppr.hs
index bf28d29be9..095d9eba7c 100644
--- a/compiler/nativeGen/X86/Ppr.hs
+++ b/compiler/nativeGen/X86/Ppr.hs
@@ -42,7 +42,7 @@ import Cmm hiding (topInfoTable)
import BlockId
import CLabel
import Unique ( pprUniqueAlways )
-import Platform
+import GHC.Platform
import FastString
import Outputable
diff --git a/compiler/nativeGen/X86/RegInfo.hs b/compiler/nativeGen/X86/RegInfo.hs
index 24823e3985..19056be4fa 100644
--- a/compiler/nativeGen/X86/RegInfo.hs
+++ b/compiler/nativeGen/X86/RegInfo.hs
@@ -15,7 +15,7 @@ import Format
import Reg
import Outputable
-import Platform
+import GHC.Platform
import Unique
import UniqFM
diff --git a/compiler/nativeGen/X86/Regs.hs b/compiler/nativeGen/X86/Regs.hs
index 37e99c5a71..2d9fd88c8e 100644
--- a/compiler/nativeGen/X86/Regs.hs
+++ b/compiler/nativeGen/X86/Regs.hs
@@ -60,7 +60,7 @@ import Cmm
import CLabel ( CLabel )
import DynFlags
import Outputable
-import Platform
+import GHC.Platform
import qualified Data.Array as A