ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
ALL_DIRS += win32
-EXCLUDED_SRCS += Itimer.c Select.c Signals.c
+else
+ALL_DIRS += posix
endif
ifneq "$(DLLized)" "YES"
EXCLUDED_SRCS += Main.c
endif
+# This file ends up being empty unless we're building for a powerpc
+# or darwin system, and it is reported that Solaris ld chokes on it when
+# building HSrts.o.
+ifeq "$(findstring $(TargetArch_CPP), powerpc powerpc64)" ""
+ifeq "$(findstring $(TargetOS_CPP), darwin)" ""
+EXCLUDED_SRCS += AdjustorAsm.S
+endif
+endif
+
EXCLUDED_SRCS += parallel/SysMan.c
# The build system doesn't give us these
# COMPILING_RTS is only used when building Win32 DLL support.
STANDARD_OPTS += -DCOMPILING_RTS
-ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-STANDARD_OPTS += -Iwin32
-endif
-
# HC_OPTS is included in both .c and .cmm compilations, whereas CC_OPTS is
# only included in .c compilations. HC_OPTS included the WAY_* opts, which
# must be included in both types of compilations.
LIBOBJS += dotnet/Invoke.o
endif
+# Suppress uninitialized variable warnings for GC.c
+GC_CC_OPTS += -Wno-uninitialized
+
#-----------------------------------------------------------------------------
# Include the Front panel code?
ifneq "$(BootingFromHc)" "YES"
$(AUTO_APPLY_CMM): $(GHC_GENAPPLY)
@$(RM) $@
- $(GHC_GENAPPLY) $(if $(filter u,$(way)), -u) >$@
+ $(GHC_GENAPPLY) $(if $(filter $(way), u debug_u), -u) >$@
endif
EXTRA_CMM_SRCS += $(AUTO_APPLY_CMM)
# and not worth re-implementing in our Makefile framework.
ifneq "$(HaveLibGmp)" "YES"
-ifneq "$(HaveFrameworkHaskellSupport)" "YES"
+ifneq "$(HaveFrameworkGMP)" "YES"
boot ::
if [ -f gmp/config.status ]; then \
cd gmp && CC=$(WhatGccIsCalled) ./config.status; \
-\#include Schedule.h \
-\#include Printer.h \
-\#include Sanity.h \
+ -\#include STM.h \
-\#include Storage.h \
-\#include SchedAPI.h \
-\#include Timer.h \
- -\#include Itimer.h \
-\#include ProfHeap.h \
-\#include LdvProfile.h \
-\#include Profiling.h \
- -\#include Apply.h
+ -\#include OSThreads.h \
+ -\#include Apply.h \
+ -\#include SMP.h
ifeq "$(Windows)" "YES"
PrimOps_HC_OPTS += -\#include '<windows.h>' -\#include win32/AsyncIO.h
+else
+PrimOps_HC_OPTS += -\#include posix/Itimer.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
+
# Cmm must be compiled via-C for now, because the NCG can't handle loops
SRC_HC_OPTS += -fvia-C
# We *want* type-checking of hand-written cmm.
SRC_HC_OPTS += -dcmm-lint
+ifneq "$(BootingFromHc)" "YES"
# .cmm files depend on all the .h files, to a first approximation.
%.$(way_)o : %.cmm $(H_FILES)
$(HC_PRE_OPTS)
$(HC_POST_OPTS)
%.$(way_)hc : %.cmm $(H_FILES)
- $(HC_PRE_OPTS)
$(HC) $(HC_OPTS) -C $< -o $@
- $(HC_POST_OPTS)
%.$(way_)s : %.cmm $(H_FILES)
- $(HC_PRE_OPTS)
$(HC) $(HC_OPTS) -S $< -o $@
- $(HC_POST_OPTS)
+endif
#-----------------------------------------------------------------------------
#