X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FMakefile;h=2b05eff5e7e57a5d3be1b480f63f5886e389aba3;hb=3cdb0ada5aecbcbe940bacf577c02c41bc65c629;hp=9828f55414b25876b019b2880b2fe9c11e457998;hpb=edad06244b0a542d6b5c9ce3f3cd72941c5be804;p=ghc-hetmet.git

diff --git a/rts/Makefile b/rts/Makefile
index 9828f55..2b05eff 100644
--- a/rts/Makefile
+++ b/rts/Makefile
@@ -44,7 +44,7 @@ endif
 NON_HS_PACKAGE = YES
 
 # grab sources from these subdirectories
-ALL_DIRS = hooks parallel
+ALL_DIRS = hooks parallel sm
 
 ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 ALL_DIRS += win32
@@ -88,7 +88,7 @@ H_FILES = $(wildcard ../includes/*.h) $(wildcard *.h)
 # gcc provides lots of useful warnings if you ask it.
 # This is a pretty good list to start with - use a # to comment out
 # any you don't like.
-WARNING_OPTS += -Wall 
+WARNING_OPTS += -Wall
 WARNING_OPTS += -W
 WARNING_OPTS += -Wstrict-prototypes 
 WARNING_OPTS += -Wmissing-prototypes 
@@ -105,7 +105,7 @@ WARNING_OPTS += -Wbad-function-cast
 #WARNING_OPTS += -Wredundant-decls 
 #WARNING_OPTS += -Wconversion
 
-STANDARD_OPTS += -I../includes -I. -Iparallel
+STANDARD_OPTS += -I../includes -I. -Iparallel -Ism
 # COMPILING_RTS is only used when building Win32 DLL support.
 STANDARD_OPTS += -DCOMPILING_RTS
 
@@ -244,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
 
@@ -320,10 +320,10 @@ SRC_HC_OPTS += -optc-fno-stack-protector
 endif
 
 # -O3 helps unroll some loops (especially in copy() with a constant argument).
-GC_HC_OPTS += -optc-O3
+sm/Evac_HC_OPTS += -optc-funroll-loops
 
 # Without this, thread_obj will not be inlined (at least on x86 with GCC 4.1.0)
-GCCompact_HC_OPTS += -optc-finline-limit=2500
+sm/Compact_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,