X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=ef3e24403294d0e105a75da8ebb0832dce121b74;hb=3eacdc7faf0d0e87a7201253f9f12c1fb4db7249;hp=ac689a919d90ff7d12388a89f0d49d2ebbeb55b5;hpb=ffcc8c9aa3ed862f26a7c05b23d09337ff104f13;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index ac689a9..ef3e244 100644
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -48,7 +48,8 @@ ALL_DIRS = hooks parallel
 
 ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 ALL_DIRS += win32
-EXCLUDED_SRCS += Itimer.c Select.c Signals.c
+else
+ALL_DIRS += posix
 endif
 
 ifneq "$(DLLized)" "YES"
@@ -58,11 +59,13 @@ EXCLUDED_SRCS += Main.c
 endif
 
 # This file ends up being empty unless we're building for a powerpc
-# system, and it is reported that Solaris ld chokes on it when building
-# HSrts.o.
+# 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
 
@@ -106,10 +109,6 @@ STANDARD_OPTS += -I../includes -I. -Iparallel
 # 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.
@@ -125,6 +124,8 @@ SRC_HC_OPTS += -static
 endif
 # SRC_HC_OPTS += -fPIC
 
+RtsMessages_CC_OPTS += -DProjectVersion=\"$(ProjectVersion)\"
+
 ifeq "$(way)" "mp"
 SRC_HC_OPTS += -I$$PVM_ROOT/include
 endif
@@ -314,7 +315,6 @@ SRC_HC_OPTS += \
   -\#include Storage.h \
   -\#include SchedAPI.h \
   -\#include Timer.h \
-  -\#include Itimer.h \
   -\#include ProfHeap.h \
   -\#include LdvProfile.h \
   -\#include Profiling.h \
@@ -324,9 +324,15 @@ SRC_HC_OPTS += \
 
 ifeq "$(Windows)" "YES"
 PrimOps_HC_OPTS += -\#include '<windows.h>' -\#include win32/AsyncIO.h
+else
+PrimOps_HC_OPTS += -\#include posix/Itimer.h
 endif
 
-GC_HC_OPTS += -optc-O3
+# -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