diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-03-18 16:37:25 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-05-06 04:43:21 -0400 |
| commit | cab1871ab93feeacf2bf9a1c65b1c919ca9c5399 (patch) | |
| tree | 1c8c7a535ca81d9f8ef26532425ff746b305cc13 /compiler | |
| parent | a95e7fe02efd2fdeec91ba46de64bc78c81381eb (diff) | |
| download | haskell-cab1871ab93feeacf2bf9a1c65b1c919ca9c5399.tar.gz | |
Move LeadingUnderscore into Platform (#17957)
Avoid direct use of DynFlags to know if symbols must be prefixed by an
underscore.
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/GHC/Cmm/CLabel.hs | 2 | ||||
| -rw-r--r-- | compiler/GHC/Driver/Session.hs | 1 | ||||
| -rw-r--r-- | compiler/GHC/Settings.hs | 3 | ||||
| -rw-r--r-- | compiler/GHC/Settings/IO.hs | 2 |
4 files changed, 1 insertions, 7 deletions
diff --git a/compiler/GHC/Cmm/CLabel.hs b/compiler/GHC/Cmm/CLabel.hs index 891384aa55..90e401d942 100644 --- a/compiler/GHC/Cmm/CLabel.hs +++ b/compiler/GHC/Cmm/CLabel.hs @@ -1218,7 +1218,7 @@ pprCLabel dflags = \case maybe_underscore :: SDoc -> SDoc maybe_underscore doc = - if platformMisc_leadingUnderscore $ platformMisc dflags + if platformLeadingUnderscore platform then pp_cSEP <> doc else doc diff --git a/compiler/GHC/Driver/Session.hs b/compiler/GHC/Driver/Session.hs index 0b76ce47e3..ac099a61dd 100644 --- a/compiler/GHC/Driver/Session.hs +++ b/compiler/GHC/Driver/Session.hs @@ -135,7 +135,6 @@ module GHC.Driver.Session ( sGhcWithSMP, sGhcRTSWays, sTablesNextToCode, - sLeadingUnderscore, sLibFFI, sGhcThreaded, sGhcDebugged, diff --git a/compiler/GHC/Settings.hs b/compiler/GHC/Settings.hs index 08b108a291..df2f817393 100644 --- a/compiler/GHC/Settings.hs +++ b/compiler/GHC/Settings.hs @@ -62,7 +62,6 @@ module GHC.Settings , sGhcWithSMP , sGhcRTSWays , sTablesNextToCode - , sLeadingUnderscore , sLibFFI , sGhcThreaded , sGhcDebugged @@ -277,8 +276,6 @@ sGhcRTSWays :: Settings -> String sGhcRTSWays = platformMisc_ghcRTSWays . sPlatformMisc sTablesNextToCode :: Settings -> Bool sTablesNextToCode = platformMisc_tablesNextToCode . sPlatformMisc -sLeadingUnderscore :: Settings -> Bool -sLeadingUnderscore = platformMisc_leadingUnderscore . sPlatformMisc sLibFFI :: Settings -> Bool sLibFFI = platformMisc_libFFI . sPlatformMisc sGhcThreaded :: Settings -> Bool diff --git a/compiler/GHC/Settings/IO.hs b/compiler/GHC/Settings/IO.hs index 225d5a6ec8..26ad17ce80 100644 --- a/compiler/GHC/Settings/IO.hs +++ b/compiler/GHC/Settings/IO.hs @@ -166,7 +166,6 @@ initSettings top_dir = do ghcWithNativeCodeGen <- getBooleanSetting "Use native code generator" ghcWithSMP <- getBooleanSetting "Support SMP" ghcRTSWays <- getSetting "RTS ways" - leadingUnderscore <- getBooleanSetting "Leading underscore" useLibFFI <- getBooleanSetting "Use LibFFI" ghcThreaded <- getBooleanSetting "Use Threads" ghcDebugged <- getBooleanSetting "Use Debugging" @@ -237,7 +236,6 @@ initSettings top_dir = do , platformMisc_ghcWithSMP = ghcWithSMP , platformMisc_ghcRTSWays = ghcRTSWays , platformMisc_tablesNextToCode = tablesNextToCode - , platformMisc_leadingUnderscore = leadingUnderscore , platformMisc_libFFI = useLibFFI , platformMisc_ghcThreaded = ghcThreaded , platformMisc_ghcDebugged = ghcDebugged |