[commit: ghc] wip/T15548: Do not pass -DTABLES_NEXT_TO_CODE to gcc (untested) (93843a6)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/T15548
Link       : http://ghc.haskell.org/trac/ghc/changeset/93843a6b95a5a3d1e750bc4618f542a9b37b9141/ghc

>---------------------------------------------------------------

commit 93843a6b95a5a3d1e750bc4618f542a9b37b9141
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Aug 22 12:58:18 2018 -0700

    Do not pass -DTABLES_NEXT_TO_CODE to gcc (untested)
    
    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?


>---------------------------------------------------------------

93843a6b95a5a3d1e750bc4618f542a9b37b9141
 compiler/main/SysTools.hs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs
index ff36c04..48f8de8 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"