summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoachim Breitner <mail@joachim-breitner.de>2018-08-22 12:58:18 -0700
committerJoachim Breitner <mail@joachim-breitner.de>2018-08-22 12:58:18 -0700
commit93843a6b95a5a3d1e750bc4618f542a9b37b9141 (patch)
tree20083537ee4be965b34be9f94d107c98deb453a3
parentbd277ef6e49dc12159776e1d7b16bfdb18bddcf3 (diff)
downloadhaskell-wip/T15548.tar.gz
Do not pass -DTABLES_NEXT_TO_CODE to gcc (untested)wip/T15548
The goal of #15548 is to make GHC itself flexible in whether it should produce TABLES_NEXT_TO_CODE code or not. Before this patch, it would statically set the default set of gcc arguments to include `-DTABLES_NEXT_TO_CODE`. But already the header files set `-DTABLES_NEXT_TO_CODE`, so maybe this is not needed at all, and can simply be removed?
-rw-r--r--compiler/main/SysTools.hs8
1 files changed, 1 insertions, 7 deletions
diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs
index ff36c04ecf..48f8de83ed 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"