summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSylvain Henry <sylvain@haskus.fr>2020-07-02 20:47:44 +0200
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-07-25 00:45:08 -0400
commit15b2b44fe35292dc3ac93ec215c44fba42165f67 (patch)
tree97e16669ac800920e9cfde47561235d4c48db23e
parente443846ba05c943877e193a9518d5817e15560f3 (diff)
downloadhaskell-15b2b44fe35292dc3ac93ec215c44fba42165f67.tar.gz
Rename GHC.Driver.Ways into GHC.Platform.Ways
-rw-r--r--compiler/GHC.hs2
-rw-r--r--compiler/GHC/CoreToStg.hs2
-rw-r--r--compiler/GHC/CoreToStg/Prep.hs2
-rw-r--r--compiler/GHC/Driver/Finder.hs2
-rw-r--r--compiler/GHC/Driver/Pipeline.hs2
-rw-r--r--compiler/GHC/Driver/Session.hs2
-rw-r--r--compiler/GHC/HsToCore/Usage.hs2
-rw-r--r--compiler/GHC/Iface/Binary.hs2
-rw-r--r--compiler/GHC/Platform/Ways.hs (renamed from compiler/GHC/Driver/Ways.hs)2
-rw-r--r--compiler/GHC/Runtime/Interpreter.hs2
-rw-r--r--compiler/GHC/Runtime/Linker.hs2
-rw-r--r--compiler/GHC/SysTools.hs2
-rw-r--r--compiler/GHC/Unit/State.hs2
-rw-r--r--compiler/ghc.cabal.in2
-rw-r--r--ghc/Main.hs2
15 files changed, 15 insertions, 15 deletions
diff --git a/compiler/GHC.hs b/compiler/GHC.hs
index f61c93ea2d..c7fac76828 100644
--- a/compiler/GHC.hs
+++ b/compiler/GHC.hs
@@ -337,7 +337,7 @@ import GHC.Driver.Finder
import GHC.Driver.Types
import GHC.Driver.CmdLine
import GHC.Driver.Session hiding (WarnReason(..))
-import GHC.Driver.Ways
+import GHC.Platform.Ways
import GHC.SysTools
import GHC.SysTools.BaseDir
import GHC.Types.Annotations
diff --git a/compiler/GHC/CoreToStg.hs b/compiler/GHC/CoreToStg.hs
index a7456d335b..871dd1d139 100644
--- a/compiler/GHC/CoreToStg.hs
+++ b/compiler/GHC/CoreToStg.hs
@@ -42,7 +42,7 @@ import GHC.Utils.Monad
import GHC.Data.FastString
import GHC.Utils.Misc
import GHC.Driver.Session
-import GHC.Driver.Ways
+import GHC.Platform.Ways
import GHC.Types.ForeignCall
import GHC.Types.Demand ( isUsedOnce )
import GHC.Builtin.PrimOps ( PrimCall(..) )
diff --git a/compiler/GHC/CoreToStg/Prep.hs b/compiler/GHC/CoreToStg/Prep.hs
index 42a59e00a3..823d5418aa 100644
--- a/compiler/GHC/CoreToStg/Prep.hs
+++ b/compiler/GHC/CoreToStg/Prep.hs
@@ -53,7 +53,7 @@ import GHC.Data.Maybe
import GHC.Data.OrdList
import GHC.Utils.Error
import GHC.Driver.Session
-import GHC.Driver.Ways
+import GHC.Platform.Ways
import GHC.Utils.Misc
import GHC.Utils.Outputable
import GHC.Data.FastString
diff --git a/compiler/GHC/Driver/Finder.hs b/compiler/GHC/Driver/Finder.hs
index a1b2f9aff0..f572fa41db 100644
--- a/compiler/GHC/Driver/Finder.hs
+++ b/compiler/GHC/Driver/Finder.hs
@@ -42,7 +42,7 @@ import GHC.Data.FastString
import GHC.Utils.Misc
import GHC.Builtin.Names ( gHC_PRIM )
import GHC.Driver.Session
-import GHC.Driver.Ways
+import GHC.Platform.Ways
import GHC.Utils.Outputable as Outputable
import GHC.Data.Maybe ( expectJust )
diff --git a/compiler/GHC/Driver/Pipeline.hs b/compiler/GHC/Driver/Pipeline.hs
index 336a3bc447..ccbd524e55 100644
--- a/compiler/GHC/Driver/Pipeline.hs
+++ b/compiler/GHC/Driver/Pipeline.hs
@@ -41,7 +41,7 @@ import GHC.Prelude
import GHC.Driver.Pipeline.Monad
import GHC.Unit.State
-import GHC.Driver.Ways
+import GHC.Platform.Ways
import GHC.Parser.Header
import GHC.Driver.Phases
import GHC.SysTools
diff --git a/compiler/GHC/Driver/Session.hs b/compiler/GHC/Driver/Session.hs
index c7fd59e1b3..8ed062de35 100644
--- a/compiler/GHC/Driver/Session.hs
+++ b/compiler/GHC/Driver/Session.hs
@@ -250,7 +250,7 @@ import GHC.Builtin.Names ( mAIN )
import {-# SOURCE #-} GHC.Unit.State (UnitState, emptyUnitState, UnitDatabase, updateIndefUnitId)
import GHC.Driver.Phases ( Phase(..), phaseInputExt )
import GHC.Driver.Flags
-import GHC.Driver.Ways
+import GHC.Platform.Ways
import GHC.Driver.Backend
import GHC.Settings.Config
import GHC.Utils.CliOption
diff --git a/compiler/GHC/HsToCore/Usage.hs b/compiler/GHC/HsToCore/Usage.hs
index 0d9d8aabd6..12f4c950cb 100644
--- a/compiler/GHC/HsToCore/Usage.hs
+++ b/compiler/GHC/HsToCore/Usage.hs
@@ -14,7 +14,7 @@ module GHC.HsToCore.Usage (
import GHC.Prelude
import GHC.Driver.Session
-import GHC.Driver.Ways
+import GHC.Platform.Ways
import GHC.Driver.Types
import GHC.Tc.Types
import GHC.Types.Name
diff --git a/compiler/GHC/Iface/Binary.hs b/compiler/GHC/Iface/Binary.hs
index 5c533cbd9c..5e9cbf15a2 100644
--- a/compiler/GHC/Iface/Binary.hs
+++ b/compiler/GHC/Iface/Binary.hs
@@ -43,7 +43,7 @@ import GHC.Driver.Types
import GHC.Unit
import GHC.Types.Name
import GHC.Driver.Session
-import GHC.Driver.Ways
+import GHC.Platform.Ways
import GHC.Types.Unique.FM
import GHC.Types.Unique.Supply
import GHC.Utils.Panic
diff --git a/compiler/GHC/Driver/Ways.hs b/compiler/GHC/Platform/Ways.hs
index 29a4d72082..c672ab656d 100644
--- a/compiler/GHC/Driver/Ways.hs
+++ b/compiler/GHC/Platform/Ways.hs
@@ -18,7 +18,7 @@
-- We then find the "build-tag" associated with this way, and this
-- becomes the suffix used to find .hi files and libraries used in
-- this compilation.
-module GHC.Driver.Ways
+module GHC.Platform.Ways
( Way(..)
, hasWay
, allowed_combination
diff --git a/compiler/GHC/Runtime/Interpreter.hs b/compiler/GHC/Runtime/Interpreter.hs
index 18a6203a08..561b4e2a6a 100644
--- a/compiler/GHC/Runtime/Interpreter.hs
+++ b/compiler/GHC/Runtime/Interpreter.hs
@@ -79,7 +79,7 @@ import GHC.Types.Unique
#if defined(HAVE_INTERNAL_INTERPRETER)
import GHCi.Run
-import GHC.Driver.Ways
+import GHC.Platform.Ways
#endif
import Control.Concurrent
diff --git a/compiler/GHC/Runtime/Linker.hs b/compiler/GHC/Runtime/Linker.hs
index 530fb767c3..35a638b12a 100644
--- a/compiler/GHC/Runtime/Linker.hs
+++ b/compiler/GHC/Runtime/Linker.hs
@@ -43,7 +43,7 @@ import GHC.Unit.State as Packages
import GHC.Driver.Phases
import GHC.Driver.Finder
import GHC.Driver.Types
-import GHC.Driver.Ways
+import GHC.Platform.Ways
import GHC.Types.Name
import GHC.Types.Name.Env
import GHC.Unit.Module
diff --git a/compiler/GHC/SysTools.hs b/compiler/GHC/SysTools.hs
index 0b71e8ccde..b72c375545 100644
--- a/compiler/GHC/SysTools.hs
+++ b/compiler/GHC/SysTools.hs
@@ -47,7 +47,7 @@ import GHC.Utils.Outputable
import GHC.Utils.Error
import GHC.Platform
import GHC.Driver.Session
-import GHC.Driver.Ways
+import GHC.Platform.Ways
import Control.Monad.Trans.Except (runExceptT)
import System.FilePath
diff --git a/compiler/GHC/Unit/State.hs b/compiler/GHC/Unit/State.hs
index 6406e79e07..fb50966195 100644
--- a/compiler/GHC/Unit/State.hs
+++ b/compiler/GHC/Unit/State.hs
@@ -88,7 +88,7 @@ import GHC.Unit.Ppr
import GHC.Unit.Types
import GHC.Unit.Module
import GHC.Driver.Session
-import GHC.Driver.Ways
+import GHC.Platform.Ways
import GHC.Types.Unique.FM
import GHC.Types.Unique.DFM
import GHC.Types.Unique.Set
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index 7d896b8ad3..db48f60105 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -181,7 +181,7 @@ Library
GHC.Driver.Monad
GHC.Driver.Hooks
GHC.Driver.Flags
- GHC.Driver.Ways
+ GHC.Platform.Ways
GHC.Types.Id
GHC.Types.Id.Info
GHC.Core.Predicate
diff --git a/ghc/Main.hs b/ghc/Main.hs
index 2f84bb9e43..41435af878 100644
--- a/ghc/Main.hs
+++ b/ghc/Main.hs
@@ -26,7 +26,7 @@ import GHC.Driver.Main ( newHscEnv )
import GHC.Driver.Pipeline ( oneShot, compileFile )
import GHC.Driver.MakeFile ( doMkDependHS )
import GHC.Driver.Backpack ( doBackpack )
-import GHC.Driver.Ways
+import GHC.Platform.Ways
#if defined(HAVE_INTERNAL_INTERPRETER)
import GHCi.UI ( interactiveUI, ghciWelcomeMsg, defaultGhciSettings )
#endif