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 /mk | |
| 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 'mk')
| -rw-r--r-- | mk/config.mk.in | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index 10326d0c25..ca17e8689b 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -211,17 +211,6 @@ else GhcWithInterpreter=$(if $(findstring YES,$(DYNAMIC_GHC_PROGRAMS)),YES,NO) endif -# GhcEnableTablesNextToCode tells us whether the target architecture -# supports placing info tables directly before the entry code -# (see TABLES_NEXT_TO_CODE in the RTS). Whether we actually compile for -# TABLES_NEXT_TO_CODE depends on whether we're building unregisterised -# code or not, which may be decided by options to the compiler later. -ifneq "$(findstring $(TargetArch_CPP)X, ia64X powerpc64X powerpc64leX)" "" -GhcEnableTablesNextToCode=NO -else -GhcEnableTablesNextToCode=YES -endif - # Whether to use libffi for adjustors (foreign import "wrapper") or # not. If we have built-in support (rts/Adjustor.c) then we use that, # otherwise we fall back on libffi, which is slightly slower. @@ -505,6 +494,7 @@ HaskellHaveIdentDirective = @HaskellHaveIdentDirective@ HaskellHaveSubsectionsViaSymbols = @HaskellHaveSubsectionsViaSymbols@ HaskellHaveRTSLinker = @HaskellHaveRTSLinker@ Unregisterised = @Unregisterised@ +TablesNextToCode = @TablesNextToCode@ SettingsCCompilerCommand = @SettingsCCompilerCommand@ SettingsHaskellCPPCommand = @SettingsHaskellCPPCommand@ |