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
# 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
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
+GC_HC_OPTS += -optc-O3
+
+# Without this, thread_obj will not be inlined (at least on x86 with GCC 4.1.0)
+GCCompact_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