Fixed uninitialised FunBind fun_tick field

[ghc-hetmet.git] / rts / Makefile

diff --git a/rts/Makefile b/rts/Makefile
index 2319788..c3c2b82 100644 (file)
--- 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
 
@@ -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
@@ -139,6 +144,10 @@ ifeq "$(HaveLibMingwEx)" "YES"
 PACKAGE_CPP_OPTS += -DHAVE_LIBMINGWEX
 endif
 
+ifeq "$(GhciWithDebugger)" "YES"
+STANDARD_OPTS += -DDEBUGGER
+endif
+
 ifeq "$(DotnetSupport)" "YES"
 
 # 
@@ -174,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
@@ -239,7 +256,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
 
@@ -301,26 +318,7 @@ endif
 # Compiling the cmm files
 
 # ToDo: should we really include Rts.h here?  Required for GNU_ATTRIBUTE().
-SRC_HC_OPTS += \
-  -I. \
-  -\#include Prelude.h \
-  -\#include Rts.h \
-  -\#include RtsFlags.h \
-  -\#include RtsUtils.h \
-  -\#include StgRun.h \
-  -\#include Schedule.h \
-  -\#include Printer.h \
-  -\#include Sanity.h \
-  -\#include STM.h \
-  -\#include Storage.h \
-  -\#include SchedAPI.h \
-  -\#include Timer.h \
-  -\#include ProfHeap.h \
-  -\#include LdvProfile.h \
-  -\#include Profiling.h \
-  -\#include OSThreads.h \
-  -\#include Apply.h \
-  -\#include SMP.h
+SRC_HC_OPTS += -I. -\#include HCIncludes.h
 
 ifeq "$(Windows)" "YES"
 PrimOps_HC_OPTS += -\#include '<windows.h>' -\#include win32/AsyncIO.h
@@ -328,11 +326,24 @@ else
 PrimOps_HC_OPTS += -\#include posix/Itimer.h
 endif
 
+# Otherwise the stack-smash handler gets triggered.
+ifeq "$(TargetOS_CPP)" "openbsd"
+SRC_HC_OPTS += -optc-fno-stack-protector
+endif
+
 # -O3 helps unroll some loops (especially in copy() with a constant argument).
-# -fno-strict-aliasing is a hack because we often mix StgPtr and StgClosure pointers
-# to the same object, and gcc will assume these don't alias.  eg. it happens in
-# copy() with gcc 3.4.3, the upd_evacee() assigments get moved before the object copy.
-GC_HC_OPTS += -optc-O3 -optc-fno-strict-aliasing
+sm/Evac_HC_OPTS += -optc-funroll-loops
+
+# 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
+
+# -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
+# allowed to assume that these pointers do not alias.  eg. without
+# this flag we get problems in GC.c:copy() with gcc 3.4.3, the
+# 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