X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=a0f5be4d76e8105d4bf5e4a95926fcbdff11616f;hb=f1b54a07ca9fb6344e94affc716487b61c5657ad;hp=043d60aba09a4a56f8a8f105eeae9fd75eab274e;hpb=8c2549461d624ad5cfec9be3266bdfd016371658;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 043d60a..a0f5be4 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -277,21 +277,15 @@ else
 GhcWithInterpreter=NO
 endif
 
-# GhcWithTablesNextToCode, which corresponds to the TABLES_NEXT_TO_CODE
-# CPP symbol, says whether to assume that info tables are assumed to
-# reside just before the code for a function.
-ifeq "$(GhcUnregisterised)" "YES"
-GhcWithTablesNextToCode=NO
-GhcWithNoRegs=YES
-GhcWithMiniInterpreter=YES
-else
-ifeq "$(findstring $(HostArch_CPP), ia64 powerpc64)" ""
-GhcWithTablesNextToCode=YES
+# 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)" ""
+GhcEnableTablesNextToCode=NO
 else
-GhcWithTablesNextToCode=NO
-endif
-GhcWithNoRegs=NO
-GhcWithMiniInterpreter=NO
+GhcEnableTablesNextToCode=YES
 endif
 
 #