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-04-09 23:17:37 -0400 |
| commit | fc3f421bd63cbf550cd0c8771aaf11e9c362f4d1 (patch) | |
| tree | 69f14337e4132d321de479740969fa1237ca7512 /compiler | |
| parent | 9acdc4c0ea14f890045e973dabcb5ad3bb029505 (diff) | |
| download | haskell-fc3f421bd63cbf550cd0c8771aaf11e9c362f4d1.tar.gz | |
GHC no longer ever defines TABLES_NEXT_TO_CODE on its own
It should be entirely the responsibility of make/Hadrian to ensure that
everything that needs this flag gets it. GHC shouldn't be hardcoded to
assist with bootstrapping since it builds other things besides itself.
Reviewers:
Subscribers: TerrorJack, rwbarton, carter
GHC Trac Issues: #15548 -- progress towards but not fix
Differential Revision: https://phabricator.haskell.org/D5082 -- extract
from that
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/main/DynFlags.hs | 2 | ||||
| -rw-r--r-- | compiler/main/SysTools.hs | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index 68c0735f71..6f2dffff3c 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -58,7 +58,7 @@ module DynFlags ( fFlags, fLangFlags, xFlags, wWarningFlags, dynFlagDependencies, - tablesNextToCode, mkTablesNextToCode, + tablesNextToCode, makeDynFlagsConsistent, shouldUseColor, shouldUseHexWordLiterals, diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs index ca30e4aae3..5725896d6b 100644 --- a/compiler/main/SysTools.hs +++ b/compiler/main/SysTools.hs @@ -199,15 +199,9 @@ initSysTools top_dir let unreg_gcc_args = if targetUnregisterised then ["-DNO_REGS", "-DUSE_MINIINTERPRETER"] else [] - -- TABLES_NEXT_TO_CODE affects the info table layout. - tntc_gcc_args - | mkTablesNextToCode targetUnregisterised - = ["-DTABLES_NEXT_TO_CODE"] - | otherwise = [] cpp_args= map Option (words cpp_args_str) gcc_args = map Option (words gcc_args_str - ++ unreg_gcc_args - ++ tntc_gcc_args) + ++ unreg_gcc_args) ldSupportsCompactUnwind <- getBooleanSetting "ld supports compact unwind" ldSupportsBuildId <- getBooleanSetting "ld supports build-id" ldSupportsFilelist <- getBooleanSetting "ld supports filelist" |