diff options
| author | Joachim Breitner <mail@joachim-breitner.de> | 2019-01-20 19:25:26 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-08-10 14:39:27 -0400 |
| commit | 818602818bb8553b241271204d159d5a40971d5a (patch) | |
| tree | 135e9d4f7d635b94effe709efc8e3f20cc6968f6 /compiler/main | |
| parent | 83ca42de519cdfa28b38164e90d726034dba768e (diff) | |
| download | haskell-818602818bb8553b241271204d159d5a40971d5a.tar.gz | |
Consolidate `TablesNextToCode` and `GhcUnreigsterised` in configure (#15548)
`TablesNextToCode` is now a substituted by configure, where it has the
correct defaults and error handling. Nowhere else needs to duplicate
that, though we may want the compiler to to guard against bogus settings
files.
I renamed it from `GhcEnableTablesNextToCode` to `TablesNextToCode` to:
- Help me guard against any unfixed usages
- Remove any lingering connotation that this flag needs to be combined
with `GhcUnreigsterised`.
Original reviewers:
Original subscribers: TerrorJack, rwbarton, carter
Original Differential Revision: https://phabricator.haskell.org/D5082
Diffstat (limited to 'compiler/main')
| -rw-r--r-- | compiler/main/DynFlags.hs | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index ca53fda26d..fe7e3134ec 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -59,7 +59,6 @@ module DynFlags ( fFlags, fLangFlags, xFlags, wWarningFlags, dynFlagDependencies, - tablesNextToCode, makeDynFlagsConsistent, shouldUseColor, shouldUseHexWordLiterals, @@ -159,6 +158,7 @@ module DynFlags ( opt_L, opt_P, opt_F, opt_c, opt_cxx, opt_a, opt_l, opt_i, opt_P_signature, opt_windres, opt_lo, opt_lc, opt_lcc, + tablesNextToCode, -- ** Manipulating DynFlags addPluginModuleName, @@ -1493,6 +1493,9 @@ opt_lc dflags= toolSettings_opt_lc $ toolSettings dflags opt_i :: DynFlags -> [String] opt_i dflags= toolSettings_opt_i $ toolSettings dflags +tablesNextToCode :: DynFlags -> Bool +tablesNextToCode = platformMisc_tablesNextToCode . platformMisc + -- | The directory for this version of ghc in the user's app directory -- (typically something like @~/.ghc/x86_64-linux-7.6.3@) -- @@ -1664,15 +1667,6 @@ defaultObjectTarget dflags = defaultHscTarget (targetPlatform dflags) (platformMisc dflags) --- Determines whether we will be compiling --- info tables that reside just before the entry code, or with an --- indirection to the entry code. See TABLES_NEXT_TO_CODE in --- includes/rts/storage/InfoTables.h. -tablesNextToCode :: DynFlags -> Bool -tablesNextToCode dflags = - not (platformUnregisterised $ targetPlatform dflags) && - platformMisc_tablesNextToCode (platformMisc dflags) - data DynLibLoader = Deployable | SystemDependent |