summaryrefslogtreecommitdiff
path: root/rts
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2009-01-08 13:11:01 +0000
committerIan Lynagh <igloo@earth.li>2009-01-08 13:11:01 +0000
commitfdd4cf1b03162605131269355bd96eb8950b941f (patch)
treea32bec63ad892b4a6ff659a1e94e11ba1877032f /rts
parentecf0782b93019747f3801e6b077ecf1482a5fb25 (diff)
downloadhaskell-fdd4cf1b03162605131269355bd96eb8950b941f.tar.gz
Add some more fields to +RTS --info
Diffstat (limited to 'rts')
-rw-r--r--rts/Makefile13
-rw-r--r--rts/RtsUtils.c9
2 files changed, 22 insertions, 0 deletions
diff --git a/rts/Makefile b/rts/Makefile
index 6646da2149..216d7def88 100644
--- a/rts/Makefile
+++ b/rts/Makefile
@@ -198,9 +198,22 @@ Main_HC_OPTS += -optc-O0
RtsMessages_CC_OPTS += -DProjectVersion=$(DQ)$(ProjectVersion)$(DQ)
RtsUtils_CC_OPTS += -DProjectVersion=$(DQ)$(ProjectVersion)$(DQ)
RtsUtils_CC_OPTS += -DRtsWay=$(DQ)rts$(_way)$(DQ)
+#
RtsUtils_CC_OPTS += -DHostPlatform=$(DQ)$(HOSTPLATFORM)$(DQ)
+RtsUtils_CC_OPTS += -DHostArch=$(DQ)$(HostArch_CPP)$(DQ)
+RtsUtils_CC_OPTS += -DHostOS=$(DQ)$(HostOS_CPP)$(DQ)
+RtsUtils_CC_OPTS += -DHostVendor=$(DQ)$(HostVendor_CPP)$(DQ)
+#
RtsUtils_CC_OPTS += -DBuildPlatform=$(DQ)$(BUILDPLATFORM)$(DQ)
+RtsUtils_CC_OPTS += -DBuildArch=$(DQ)$(BuildArch_CPP)$(DQ)
+RtsUtils_CC_OPTS += -DBuildOS=$(DQ)$(BuildOS_CPP)$(DQ)
+RtsUtils_CC_OPTS += -DBuildVendor=$(DQ)$(BuildVendor_CPP)$(DQ)
+#
RtsUtils_CC_OPTS += -DTargetPlatform=$(DQ)$(TARGETPLATFORM)$(DQ)
+RtsUtils_CC_OPTS += -DTargetArch=$(DQ)$(TargetArch_CPP)$(DQ)
+RtsUtils_CC_OPTS += -DTargetOS=$(DQ)$(TargetOS_CPP)$(DQ)
+RtsUtils_CC_OPTS += -DTargetVendor=$(DQ)$(TargetVendor_CPP)$(DQ)
+#
RtsUtils_CC_OPTS += -DGhcUnregisterised=$(DQ)$(GhcUnregisterised)$(DQ)
RtsUtils_CC_OPTS += -DGhcEnableTablesNextToCode=$(DQ)$(GhcEnableTablesNextToCode)$(DQ)
diff --git a/rts/RtsUtils.c b/rts/RtsUtils.c
index 7d6c4a557c..42bffed514 100644
--- a/rts/RtsUtils.c
+++ b/rts/RtsUtils.c
@@ -480,8 +480,17 @@ void printRtsInfo(void) {
mkRtsInfoPair("GHC version", ProjectVersion);
mkRtsInfoPair("RTS way", RtsWay);
mkRtsInfoPair("Host platform", HostPlatform);
+ mkRtsInfoPair("Host architecture", HostArch);
+ mkRtsInfoPair("Host OS", HostOS);
+ mkRtsInfoPair("Host vendor", HostVendor);
mkRtsInfoPair("Build platform", BuildPlatform);
+ mkRtsInfoPair("Build architecture", BuildArch);
+ mkRtsInfoPair("Build OS", BuildOS);
+ mkRtsInfoPair("Build vendor", BuildVendor);
mkRtsInfoPair("Target platform", TargetPlatform);
+ mkRtsInfoPair("Target architecture", TargetArch);
+ mkRtsInfoPair("Target OS", TargetOS);
+ mkRtsInfoPair("Target vendor", TargetVendor);
mkRtsInfoPair("Compiler unregisterised", GhcUnregisterised);
mkRtsInfoPair("Tables next to code", GhcEnableTablesNextToCode);
printf(" ]\n");