diff options
| -rw-r--r-- | compiler/GHC/Driver/Session.hs | 3 | ||||
| -rw-r--r-- | compiler/GHC/Platform.hs | 3 | ||||
| -rw-r--r-- | compiler/GHC/Settings.hs | 9 | ||||
| -rw-r--r-- | compiler/GHC/Settings/IO.hs | 6 |
4 files changed, 0 insertions, 21 deletions
diff --git a/compiler/GHC/Driver/Session.hs b/compiler/GHC/Driver/Session.hs index 67fa5c0103..5d194d2d58 100644 --- a/compiler/GHC/Driver/Session.hs +++ b/compiler/GHC/Driver/Session.hs @@ -121,10 +121,7 @@ module GHC.Driver.Session ( sExtraGccViaCFlags, sTargetPlatformString, sGhcWithInterpreter, - sGhcWithSMP, - sGhcRTSWays, sLibFFI, - sGhcRtsWithLibdw, GhcNameVersion(..), FileSettings(..), PlatformMisc(..), diff --git a/compiler/GHC/Platform.hs b/compiler/GHC/Platform.hs index 027a772759..4faf20d24e 100644 --- a/compiler/GHC/Platform.hs +++ b/compiler/GHC/Platform.hs @@ -254,10 +254,7 @@ data PlatformMisc = PlatformMisc { -- TODO Recalculate string from richer info? platformMisc_targetPlatformString :: String , platformMisc_ghcWithInterpreter :: Bool - , platformMisc_ghcWithSMP :: Bool - , platformMisc_ghcRTSWays :: String , platformMisc_libFFI :: Bool - , platformMisc_ghcRtsWithLibdw :: Bool , platformMisc_llvmTarget :: String } diff --git a/compiler/GHC/Settings.hs b/compiler/GHC/Settings.hs index f86fd9641d..73f3b97b54 100644 --- a/compiler/GHC/Settings.hs +++ b/compiler/GHC/Settings.hs @@ -58,10 +58,7 @@ module GHC.Settings , sExtraGccViaCFlags , sTargetPlatformString , sGhcWithInterpreter - , sGhcWithSMP - , sGhcRTSWays , sLibFFI - , sGhcRtsWithLibdw ) where import GHC.Prelude @@ -268,11 +265,5 @@ sTargetPlatformString :: Settings -> String sTargetPlatformString = platformMisc_targetPlatformString . sPlatformMisc sGhcWithInterpreter :: Settings -> Bool sGhcWithInterpreter = platformMisc_ghcWithInterpreter . sPlatformMisc -sGhcWithSMP :: Settings -> Bool -sGhcWithSMP = platformMisc_ghcWithSMP . sPlatformMisc -sGhcRTSWays :: Settings -> String -sGhcRTSWays = platformMisc_ghcRTSWays . sPlatformMisc sLibFFI :: Settings -> Bool sLibFFI = platformMisc_libFFI . sPlatformMisc -sGhcRtsWithLibdw :: Settings -> Bool -sGhcRtsWithLibdw = platformMisc_ghcRtsWithLibdw . sPlatformMisc diff --git a/compiler/GHC/Settings/IO.hs b/compiler/GHC/Settings/IO.hs index 49dd910d43..1e56d1c087 100644 --- a/compiler/GHC/Settings/IO.hs +++ b/compiler/GHC/Settings/IO.hs @@ -140,10 +140,7 @@ initSettings top_dir = do let iserv_prog = libexec "ghc-iserv" ghcWithInterpreter <- getBooleanSetting "Use interpreter" - ghcWithSMP <- getBooleanSetting "Support SMP" - ghcRTSWays <- getSetting "RTS ways" useLibFFI <- getBooleanSetting "Use LibFFI" - ghcRtsWithLibdw <- getBooleanSetting "RTS expects libdw" return $ Settings { sGhcNameVersion = GhcNameVersion @@ -207,10 +204,7 @@ initSettings top_dir = do , sPlatformMisc = PlatformMisc { platformMisc_targetPlatformString = targetPlatformString , platformMisc_ghcWithInterpreter = ghcWithInterpreter - , platformMisc_ghcWithSMP = ghcWithSMP - , platformMisc_ghcRTSWays = ghcRTSWays , platformMisc_libFFI = useLibFFI - , platformMisc_ghcRtsWithLibdw = ghcRtsWithLibdw , platformMisc_llvmTarget = llvmTarget } |