X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FMakefile;h=c3c2b82fc428c6fda6d7acc9411a9a245c755b9a;hb=5f8b35ad729740cab1cb8c884deb405dcc758683;hp=c01a907fdd1e0937be0e129a3c3ec9eda3c53f58;hpb=ab0e778ccfde61aed4c22679b24d175fc6cc9bf3;p=ghc-hetmet.git

diff --git a/rts/Makefile b/rts/Makefile
index c01a907..c3c2b82 100644
--- a/rts/Makefile
+++ b/rts/Makefile
@@ -144,6 +144,10 @@ ifeq "$(HaveLibMingwEx)" "YES"
 PACKAGE_CPP_OPTS += -DHAVE_LIBMINGWEX
 endif
 
+ifeq "$(GhciWithDebugger)" "YES"
+STANDARD_OPTS += -DDEBUGGER
+endif
+
 ifeq "$(DotnetSupport)" "YES"
 
 # 
@@ -179,6 +183,14 @@ EXCLUDED_SRCS		+= $(wildcard Vis*.c)
 endif
 
 #-----------------------------------------------------------------------------
+# Add PAPI library if needed
+
+ifeq "$(GhcRtsWithPapi)" "YES"
+SRC_HC_OPTS		+= -optc-DUSE_PAPI
+PACKAGE_CPP_OPTS	+= -DUSE_PAPI
+endif
+
+#-----------------------------------------------------------------------------
 # make depend setup
 
 SRC_MKDEPENDC_OPTS += -I. -I../includes
@@ -320,10 +332,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,