X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=07ebbba1dc49dc2efc1190e9e2ed6927677fe2a0;hb=451365f9af74f40d403906e113b733e42187aa1d;hp=317fc9336a7e5e952220cc000bce3c813a546f9e;hpb=8e68f0ae1f572ce18f403bd1908726b2fec4ec17;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 317fc93..07ebbba 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -187,7 +187,7 @@ IncludeExampleDirsInBuild=NO
 
 #
 # Which ways should DocBook XML documents be built?
-# options are: dvi ps pdf html
+# options are: dvi ps pdf html chm HxS
 #
 XMLDocWays=
 
@@ -348,11 +348,14 @@ StripLibraries=NO
 #	Don't use -split-objs in in GhcLibHcOpts, because the build
 #		system needs to do other special magic if you are
 #		doing object-file splitting
+ifneq "$(findstring $(HostArch_CPP), i386 powerpc sparc)" ""
+SplitObjs=YES
+else
+SplitObjs=NO
+endif
 
 # Don't split object files for libs if we're building DLLs, or booting from
 # .hc files.
-SplitObjs=YES
-
 ifeq "$(DLLized)" "YES"
 SplitObjs=NO
 endif
@@ -365,15 +368,12 @@ endif
 ifeq "$(TargetArch_CPP)" "ia64"
 SplitObjs=NO
 endif
-ifeq "$(TargetArch_CPP)" "x86_64"
-SplitObjs=NO
-endif
 
 # ----------------------------------------------------------------------------
 # Options for GHC's RTS
 
 # For an optimised RTS (you probably don't want to change these; we build
-# a debugging RTS by default now.  Use -package rts_debug to get it).
+# a debugging RTS by default now.  Use -debug to get it).
 GhcRtsHcOpts=-O2
 GhcRtsCcOpts=-fomit-frame-pointer
 
@@ -474,6 +474,9 @@ NoFibWays = $(GhcLibWays)
 # Haskell compiler options for nofib
 NoFibHcOpts = -O
 
+# Number of times to run each program
+NoFibRuns = 5
+
 # ==============================================================================
 #
 #			END OF PROJECT-SPECIFIC STUFF