diff options
author | Sylvain Henry <sylvain@haskus.fr> | 2020-05-14 10:21:34 +0200 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-05-24 01:55:24 -0400 |
commit | a0ea59d641d400543e9e803007500da01eedf48a (patch) | |
tree | d5b817282db575326a3745fd089f3d86a752ff1d /compiler/GHC | |
parent | e0eda0707d6cc3d5a85cfb13543df61623e82070 (diff) | |
download | haskell-a0ea59d641d400543e9e803007500da01eedf48a.tar.gz |
Move Config module into GHC.Settings
Diffstat (limited to 'compiler/GHC')
-rw-r--r-- | compiler/GHC/CmmToAsm.hs | 2 | ||||
-rw-r--r-- | compiler/GHC/CmmToAsm/Dwarf.hs | 6 | ||||
-rw-r--r-- | compiler/GHC/Driver/Session.hs | 2 | ||||
-rw-r--r-- | compiler/GHC/Iface/Ext/Binary.hs | 3 | ||||
-rw-r--r-- | compiler/GHC/Iface/Ext/Types.hs | 2 | ||||
-rw-r--r-- | compiler/GHC/Settings/Constants.hs | 2 | ||||
-rw-r--r-- | compiler/GHC/Settings/IO.hs | 2 | ||||
-rw-r--r-- | compiler/GHC/Utils/Panic/Plain.hs | 2 |
8 files changed, 10 insertions, 11 deletions
diff --git a/compiler/GHC/CmmToAsm.hs b/compiler/GHC/CmmToAsm.hs index f771d79254..fa053e4e66 100644 --- a/compiler/GHC/CmmToAsm.hs +++ b/compiler/GHC/CmmToAsm.hs @@ -62,7 +62,7 @@ import GHC.Utils.Asm import GHC.CmmToAsm.Reg.Target import GHC.Platform import GHC.CmmToAsm.BlockLayout as BlockLayout -import Config +import GHC.Settings.Config import GHC.CmmToAsm.Instr import GHC.CmmToAsm.PIC import GHC.Platform.Reg diff --git a/compiler/GHC/CmmToAsm/Dwarf.hs b/compiler/GHC/CmmToAsm/Dwarf.hs index e15e9b3fdb..5e52e12867 100644 --- a/compiler/GHC/CmmToAsm/Dwarf.hs +++ b/compiler/GHC/CmmToAsm/Dwarf.hs @@ -5,9 +5,9 @@ module GHC.CmmToAsm.Dwarf ( import GHC.Prelude import GHC.Cmm.CLabel -import GHC.Cmm.Expr ( GlobalReg(..) ) -import Config ( cProjectName, cProjectVersion ) -import GHC.Core ( Tickish(..) ) +import GHC.Cmm.Expr ( GlobalReg(..) ) +import GHC.Settings.Config ( cProjectName, cProjectVersion ) +import GHC.Core ( Tickish(..) ) import GHC.Cmm.DebugBlock import GHC.Driver.Session import GHC.Unit.Module diff --git a/compiler/GHC/Driver/Session.hs b/compiler/GHC/Driver/Session.hs index 87b13a8e99..15aeeb4800 100644 --- a/compiler/GHC/Driver/Session.hs +++ b/compiler/GHC/Driver/Session.hs @@ -251,7 +251,7 @@ import {-# SOURCE #-} GHC.Unit.State (PackageState, emptyPackageState, PackageDa import GHC.Driver.Phases ( Phase(..), phaseInputExt ) import GHC.Driver.Flags import GHC.Driver.Ways -import Config +import GHC.Settings.Config import GHC.Utils.CliOption import GHC.Driver.CmdLine hiding (WarnReason(..)) import qualified GHC.Driver.CmdLine as Cmd diff --git a/compiler/GHC/Iface/Ext/Binary.hs b/compiler/GHC/Iface/Ext/Binary.hs index 246e918946..cc13910723 100644 --- a/compiler/GHC/Iface/Ext/Binary.hs +++ b/compiler/GHC/Iface/Ext/Binary.hs @@ -17,8 +17,7 @@ module GHC.Iface.Ext.Binary where import GHC.Settings.Utils ( maybeRead ) - -import Config ( cProjectVersion ) +import GHC.Settings.Config ( cProjectVersion ) import GHC.Prelude import GHC.Utils.Binary import GHC.Iface.Binary ( getDictFastString ) diff --git a/compiler/GHC/Iface/Ext/Types.hs b/compiler/GHC/Iface/Ext/Types.hs index bddabedf13..a216272d7f 100644 --- a/compiler/GHC/Iface/Ext/Types.hs +++ b/compiler/GHC/Iface/Ext/Types.hs @@ -14,7 +14,7 @@ module GHC.Iface.Ext.Types where import GHC.Prelude -import Config +import GHC.Settings.Config import GHC.Utils.Binary import GHC.Data.FastString ( FastString ) import GHC.Iface.Type diff --git a/compiler/GHC/Settings/Constants.hs b/compiler/GHC/Settings/Constants.hs index a852a5845d..6eeaab84df 100644 --- a/compiler/GHC/Settings/Constants.hs +++ b/compiler/GHC/Settings/Constants.hs @@ -3,7 +3,7 @@ module GHC.Settings.Constants where import GHC.Prelude -import Config +import GHC.Settings.Config hiVersion :: Integer hiVersion = read (cProjectVersionInt ++ cProjectPatchLevel) :: Integer diff --git a/compiler/GHC/Settings/IO.hs b/compiler/GHC/Settings/IO.hs index 26ad17ce80..c43e28cef9 100644 --- a/compiler/GHC/Settings/IO.hs +++ b/compiler/GHC/Settings/IO.hs @@ -14,7 +14,7 @@ import GHC.Prelude import GHC.Settings.Platform import GHC.Settings.Utils -import Config +import GHC.Settings.Config import GHC.Utils.CliOption import GHC.Utils.Fingerprint import GHC.Platform diff --git a/compiler/GHC/Utils/Panic/Plain.hs b/compiler/GHC/Utils/Panic/Plain.hs index 37e0574d4b..8e4aed5046 100644 --- a/compiler/GHC/Utils/Panic/Plain.hs +++ b/compiler/GHC/Utils/Panic/Plain.hs @@ -27,7 +27,7 @@ module GHC.Utils.Panic.Plain #include "HsVersions.h" -import Config +import GHC.Settings.Config import GHC.Utils.Exception as Exception import GHC.Stack import GHC.Prelude |