summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--compiler/GHC/CmmToAsm.hs2
-rw-r--r--compiler/GHC/CmmToAsm/Dwarf.hs6
-rw-r--r--compiler/GHC/Driver/Session.hs2
-rw-r--r--compiler/GHC/Iface/Ext/Binary.hs3
-rw-r--r--compiler/GHC/Iface/Ext/Types.hs2
-rw-r--r--compiler/GHC/Settings/Constants.hs2
-rw-r--r--compiler/GHC/Settings/IO.hs2
-rw-r--r--compiler/GHC/Utils/Panic/Plain.hs2
-rw-r--r--compiler/ghc.cabal.in2
-rw-r--r--compiler/ghc.mk6
-rw-r--r--ghc/GHCi/UI.hs2
-rw-r--r--ghc/Main.hs2
-rw-r--r--hadrian/src/Rules/Generate.hs4
-rw-r--r--hadrian/src/Rules/ToolArgs.hs2
-rw-r--r--testsuite/tests/ghc-api/T7478/T7478.hs2
-rw-r--r--testsuite/tests/ghc-api/ghcApi.hs2
16 files changed, 21 insertions, 22 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
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index c4cedb2c18..260f231098 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -360,7 +360,7 @@ Library
GHC.Types.Annotations
GHC.Driver.CmdLine
GHC.Driver.CodeOutput
- Config
+ GHC.Settings.Config
GHC.Settings.Constants
GHC.Driver.MakeFile
GHC.Driver.Phases
diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index e5351b95db..6a2dadc820 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -46,7 +46,7 @@ $(foreach n,1 2 3, \
)
$(foreach n,1 2 3, \
- $(eval compiler/stage$n/package-data.mk : compiler/stage$n/build/Config.hs) \
+ $(eval compiler/stage$n/package-data.mk : compiler/stage$n/build/GHC/Settings/Config.hs) \
$(eval compiler/stage$n/build/PlatformConstants.o : $(includes_GHCCONSTANTS_HASKELL_TYPE)) \
$(eval compiler/stage$n/build/GHC/Driver/Session.o: $(includes_GHCCONSTANTS_HASKELL_EXPORTS)) \
$(eval compiler/stage$n/build/GHC/Driver/Session.o: $(includes_GHCCONSTANTS_HASKELL_WRAPPERS)) \
@@ -63,11 +63,11 @@ HOSTPLATFORM_3 = $(TARGETPLATFORM)
define compilerConfig
# $1 = compile stage (1-indexed)
-compiler/stage$1/build/Config.hs : mk/config.mk mk/project.mk | $$$$(dir $$$$@)/.
+compiler/stage$1/build/GHC/Settings/Config.hs : mk/config.mk mk/project.mk | $$$$(dir $$$$@)/.
$$(call removeFiles,$$@)
@echo 'Creating $$@ ... '
@echo '{-# LANGUAGE CPP #-}' >> $$@
- @echo 'module Config' >> $$@
+ @echo 'module GHC.Settings.Config' >> $$@
@echo ' ( module GHC.Version' >> $$@
@echo ' , cBuildPlatformString' >> $$@
@echo ' , cHostPlatformString' >> $$@
diff --git a/ghc/GHCi/UI.hs b/ghc/GHCi/UI.hs
index 36e27dd5b4..51084c8e8a 100644
--- a/ghc/GHCi/UI.hs
+++ b/ghc/GHCi/UI.hs
@@ -73,7 +73,7 @@ import GHC.Runtime.Loader ( initializePlugins )
-- Other random utilities
import GHC.Types.Basic hiding ( isTopLevel )
-import Config
+import GHC.Settings.Config
import GHC.Data.Graph.Directed
import GHC.Utils.Encoding
import GHC.Data.FastString
diff --git a/ghc/Main.hs b/ghc/Main.hs
index 5e194369ca..fa1169f64f 100644
--- a/ghc/Main.hs
+++ b/ghc/Main.hs
@@ -46,7 +46,7 @@ import GHC.Unit.Module ( ModuleName, mkModuleName )
import GHC.HandleEncoding
import GHC.Platform
import GHC.Platform.Host
-import Config
+import GHC.Settings.Config
import GHC.Settings.Constants
import GHC.Driver.Types
import GHC.Unit.State ( pprPackages, pprPackagesSimple )
diff --git a/hadrian/src/Rules/Generate.hs b/hadrian/src/Rules/Generate.hs
index b332713222..689e0fdd3f 100644
--- a/hadrian/src/Rules/Generate.hs
+++ b/hadrian/src/Rules/Generate.hs
@@ -114,7 +114,7 @@ generatePackageCode context@(Context stage pkg _) = do
priority 2.0 $ do
when (pkg == compiler) $ do
- root -/- "**" -/- dir -/- "Config.hs" %> go generateConfigHs
+ root -/- "**" -/- dir -/- "GHC/Settings/Config.hs" %> go generateConfigHs
root -/- "**" -/- dir -/- "*.hs-incl" %> genPrimopCode context
when (pkg == ghcPrim) $ do
root -/- "**" -/- dir -/- "GHC/Prim.hs" %> genPrimopCode context
@@ -346,7 +346,7 @@ generateConfigHs = do
cBooterVersion <- getSetting GhcVersion
return $ unlines
[ "{-# LANGUAGE CPP #-}"
- , "module Config"
+ , "module GHC.Settings.Config"
, " ( module GHC.Version"
, " , cBuildPlatformString"
, " , cHostPlatformString"
diff --git a/hadrian/src/Rules/ToolArgs.hs b/hadrian/src/Rules/ToolArgs.hs
index ef75c49d15..8277d580fa 100644
--- a/hadrian/src/Rules/ToolArgs.hs
+++ b/hadrian/src/Rules/ToolArgs.hs
@@ -68,7 +68,7 @@ allDeps = do
root <- buildRoot
let dir = buildDir (vanillaContext Stage0 compiler)
- need [ root -/- dir -/- "Config.hs" ]
+ need [ root -/- dir -/- "GHC" -/- "Settings" -/- "Config.hs" ]
need [ root -/- dir -/- "GHC" -/- "Parser.hs" ]
need [ root -/- dir -/- "GHC" -/- "Parser" -/- "Lexer.hs" ]
need [ root -/- dir -/- "GHC" -/- "Cmm" -/- "Parser.hs" ]
diff --git a/testsuite/tests/ghc-api/T7478/T7478.hs b/testsuite/tests/ghc-api/T7478/T7478.hs
index 383b1ebd93..2e5c735c9c 100644
--- a/testsuite/tests/ghc-api/T7478/T7478.hs
+++ b/testsuite/tests/ghc-api/T7478/T7478.hs
@@ -6,7 +6,7 @@ import Control.Monad (void)
import System.Environment
import GHC
-import qualified Config as GHC
+import qualified GHC.Settings.Config as GHC
import qualified GHC.Utils.Outputable as GHC
import GHC.Driver.Monad (liftIO)
import GHC.Utils.Outputable (PprStyle, queryQual)
diff --git a/testsuite/tests/ghc-api/ghcApi.hs b/testsuite/tests/ghc-api/ghcApi.hs
index 90784e8440..91552262d3 100644
--- a/testsuite/tests/ghc-api/ghcApi.hs
+++ b/testsuite/tests/ghc-api/ghcApi.hs
@@ -1,7 +1,7 @@
module Main where
-import Config
+import GHC.Settings.Config
main :: IO ()
main = putStrLn cProjectName
View Lorry Controller Status