X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FMakefile;h=d187547c39f0985127f24c8a8c64cd3b574a1631;hb=2246c514eade324d70058ba3135dc0c51ee9353b;hp=ff7d82af50717b3dd63c30c880dd5530cdfceb81;hpb=27db51b3ef829728dd1c16d1324f959d116d67ea;p=ghc-hetmet.git

diff --git a/rts/Makefile b/rts/Makefile
index ff7d82a..d187547 100644
--- a/rts/Makefile
+++ b/rts/Makefile
@@ -119,6 +119,11 @@ SRC_CC_OPTS += $(STANDARD_OPTS)
 SRC_CC_OPTS += $(GhcRtsCcOpts)
 SRC_HC_OPTS += $(GhcRtsHcOpts)
 
+ifneq "$(GhcWithSMP)" "YES"
+SRC_CC_OPTS += -DNOSMP
+SRC_HC_OPTS += -optc-DNOSMP
+endif
+
 ifneq "$(DLLized)" "YES"
 SRC_HC_OPTS += -static
 endif
@@ -239,7 +244,7 @@ boot ::
 	if [ -f gmp/config.status ]; then \
 	   cd gmp && CC=$(WhatGccIsCalled) ./config.status; \
         else \
-	   cd gmp && CC=$(WhatGccIsCalled) ./configure --enable-shared=no \
+	   cd gmp && CC=$(WhatGccIsCalled) $(SHELL) configure --enable-shared=no \
 		        --host=`echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g'`; \
 	fi
 
@@ -317,6 +322,9 @@ endif
 # -O3 helps unroll some loops (especially in copy() with a constant argument).
 GC_HC_OPTS += -optc-O3
 
+# Without this, thread_obj will not be inlined (at least on x86 with GCC 4.1.0)
+GCCompact_HC_OPTS += -optc-finline-limit=2500
+
 # -fno-strict-aliasing is required for the runtime, because we often
 # use a variety of types to represent closure pointers (StgPtr,
 # StgClosure, StgMVar, etc.), and without -fno-strict-aliasing gcc is
@@ -325,6 +333,9 @@ GC_HC_OPTS += -optc-O3
 # upd_evacee() assigments get moved before the object copy.
 SRC_CC_OPTS += -fno-strict-aliasing
 
+# Cmm must be compiled via-C for now, because the NCG can't handle loops
+SRC_HC_OPTS += -fvia-C
+
 # We *want* type-checking of hand-written cmm.
 SRC_HC_OPTS += -dcmm-lint