X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Frts%2FMakefile;h=f8a7c73c4b212346b4990d95eaec5f44bb48c9dd;hb=03a9ff01812afc81eb5236fd3063cbec44cf469e;hp=934c4291d6c493b494963c8643912f0acd03c3cf;hpb=f97dcf9fc2ea2a419087bca53f2fea811c5181a9;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 934c429..f8a7c73 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.
@@ -318,12 +317,20 @@ SRC_HC_OPTS += \
   -\#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
 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