Better handling of node parameter in calling conventions

[ghc-hetmet.git] / rts / Makefile

diff --git a/rts/Makefile b/rts/Makefile
index 719b11c..bda4bc7 100644 (file)
--- a/rts/Makefile
+++ b/rts/Makefile
@@ -35,8 +35,7 @@ endif
 # -----------------------------------------------------------------------------
 # RTS ways
 
-WAYS=
-# $(strip $(GhcLibWays) $(GhcRTSWays))
+WAYS=$(strip $(GhcLibWays) $(GhcRTSWays))
 
 ifneq "$(findstring debug, $(way))" ""
 GhcRtsHcOpts=
@@ -58,7 +57,7 @@ override HADDOCK_DOCS = NO
 NON_HS_PACKAGE = YES
 
 # grab sources from these subdirectories
-ALL_DIRS = hooks parallel sm
+ALL_DIRS = hooks parallel sm eventlog
 
 ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 ALL_DIRS += win32
@@ -138,7 +137,8 @@ WARNING_OPTS += -Waggregate-return
 #WARNING_OPTS += -Wredundant-decls 
 #WARNING_OPTS += -Wconversion
 
-STANDARD_OPTS += -I../includes -I. -Iparallel -Ism
+STANDARD_OPTS += -I../includes -I. -Iparallel -Ism -Ieventlog
+
 # COMPILING_RTS is only used when building Win32 DLL support.
 STANDARD_OPTS += -DCOMPILING_RTS
 
@@ -310,6 +310,7 @@ endif
 
 else # GhcRtsWithPapi==YES
 
+PACKAGE_CPP_OPTS += -DPAPI_INCLUDE_DIR=""
 PACKAGE_CPP_OPTS += -DPAPI_LIB_DIR=""
 
 endif
@@ -323,7 +324,7 @@ SRC_MKDEPENDC_OPTS += -I. -I../includes
 # a superset of the dependencies.  To do this properly, we should generate
 # a different set of dependencies for each way.  Further hack: PROFILING and
 # TICKY_TICKY can't be used together, so we omit TICKY_TICKY for now.
-SRC_MKDEPENDC_OPTS += -DPROFILING -DTHREADED_RTS -DDEBUG
+SRC_MKDEPENDC_OPTS += -DPROFILING -DTHREADED_RTS -DDEBUG -DEVENTLOG
 
 # -----------------------------------------------------------------------------
 # The auto-generated apply code
@@ -427,6 +428,8 @@ sm/Scav_thr.c : sm/Scav.c
 
 sm/Evac_thr_HC_OPTS += -optc-DPARALLEL_GC
 sm/Scav_thr_HC_OPTS += -optc-DPARALLEL_GC
+
+sm/Evac_thr_HC_OPTS += -optc-funroll-loops
 else
 EXCLUDED_SRCS += sm/Evac_thr.c sm/Scav_thr.c
 endif