Add unreg/tables-next-code output to +RTS --info

diff --git a/rts/Makefile b/rts/Makefile
index 9ab9652..7b17ce3 100644 (file)
--- a/rts/Makefile
+++ b/rts/Makefile
@@ -132,6 +132,8 @@ RtsFlags_CC_OPTS += -DRtsWay=\"rts$(_way)\"
 RtsFlags_CC_OPTS += -DHostPlatform=\"$(HOSTPLATFORM)\"
 RtsFlags_CC_OPTS += -DBuildPlatform=\"$(BUILDPLATFORM)\"
 RtsFlags_CC_OPTS += -DTargetPlatform=\"$(TARGETPLATFORM)\"
 RtsFlags_CC_OPTS += -DHostPlatform=\"$(HOSTPLATFORM)\"
 RtsFlags_CC_OPTS += -DBuildPlatform=\"$(BUILDPLATFORM)\"
 RtsFlags_CC_OPTS += -DTargetPlatform=\"$(TARGETPLATFORM)\"

+RtsFlags_CC_OPTS += -DGhcUnregisterised=\"$(GhcUnregisterised)\"
+RtsFlags_CC_OPTS += -DGhcEnableTablesNextToCode=\"$(GhcEnableTablesNextToCode)\"

 
 ifeq "$(way)" "mp"
 SRC_HC_OPTS += -I$$PVM_ROOT/include
 
 ifeq "$(way)" "mp"
 SRC_HC_OPTS += -I$$PVM_ROOT/include

diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c
index 1e8654d..4c1f739 100644 (file)
--- a/rts/RtsFlags.c
+++ b/rts/RtsFlags.c
@@ -684,12 +684,18 @@ error = rtsTrue;
                   }
                   else if (strequal("info",
                                &rts_argv[arg][2])) {
                   }
                   else if (strequal("info",
                                &rts_argv[arg][2])) {

+                      char *s;

                       printf("RTS info:\n");
                       printf("RTS from GHC " ProjectVersion "\n");
                       printf("RTS way " RtsWay "\n");
                       printf("Host platform " HostPlatform "\n");
                       printf("Build platform " BuildPlatform "\n");
                       printf("Target platform " TargetPlatform "\n");
                       printf("RTS info:\n");
                       printf("RTS from GHC " ProjectVersion "\n");
                       printf("RTS way " RtsWay "\n");
                       printf("Host platform " HostPlatform "\n");
                       printf("Build platform " BuildPlatform "\n");
                       printf("Target platform " TargetPlatform "\n");

+                      s = strcmp(GhcUnregisterised, "YES") == 0 ? "un" : "";
+                      printf("Compiler is %sregisterised\n", s);
+                      s = strcmp(GhcEnableTablesNextToCode, "YES") == 0
+                        ? "" : "not ";
+                      printf("Tables are %snext to code\n", s);

                       exit(0);
                   }
                   else {
                       exit(0);
                   }
                   else {