X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FMakefile;h=ab1eb3d7d80577077a97bd9b74da75e5b4ab9b75;hb=abd113f06ebf3ac29f852e80c5a8c0060f979202;hp=7d12d0b77a917f726f9f1ee589b6871c759affc4;hpb=5c6aded9bba7bdea0d301aba243d28f659e02327;p=ghc-hetmet.git

diff --git a/rts/Makefile b/rts/Makefile
index 7d12d0b..ab1eb3d 100644
--- a/rts/Makefile
+++ b/rts/Makefile
@@ -278,7 +278,7 @@ endif
 
 ifeq "$(GhcRtsWithPapi)" "YES"
 
-SRC_HC_OPTS		+= -optc-DUSE_PAPI
+SRC_CC_OPTS		+= -DUSE_PAPI
 PACKAGE_CPP_OPTS	+= -DUSE_PAPI
 
 PACKAGE_CPP_OPTS += -DPAPI_INCLUDE_DIR=$(PapiIncludeDir)
@@ -397,6 +397,20 @@ endif
 # -O3 helps unroll some loops (especially in copy() with a constant argument).
 sm/Evac_HC_OPTS += -optc-funroll-loops
 
+ifneq "$(findstring thr, $(way))" ""
+EXTRA_SRCS += sm/Evac_thr.c sm/Scav_thr.c
+
+sm/Evac_thr.c : sm/Evac.c
+	cp $< $@
+sm/Scav_thr.c : sm/Scav.c
+	cp $< $@
+
+sm/Evac_thr_HC_OPTS += -optc-DPARALLEL_GC
+sm/Scav_thr_HC_OPTS += -optc-DPARALLEL_GC
+else
+EXCLUDED_SRCS += sm/Evac_thr.c sm/Scav_thr.c
+endif
+
 # Without this, thread_obj will not be inlined (at least on x86 with GCC 4.1.0)
 sm/Compact_HC_OPTS += -optc-finline-limit=2500