X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fghc.mk;h=79b84caf70a43997b1fe92117684825b61da1137;hb=99332983ad06a8cfef34c7908a73038c6f3f4781;hp=9c33896621999fbc0eb2a69717bf2c44952d6a31;hpb=02416f002b7f78c3842a622f53e1ed0aa143a337;p=ghc-hetmet.git

diff --git a/rts/ghc.mk b/rts/ghc.mk
index 9c33896..79b84ca 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -62,11 +62,9 @@ rts_AUTO_APPLY_CMM = rts/dist/build/AutoApply.cmm
 $(rts_AUTO_APPLY_CMM): $(GENAPPLY_INPLACE)
 	"$(GENAPPLY_INPLACE)" >$@
 
-rts/dist/build/sm/Evac_thr.c : rts/sm/Evac.c
-	"$(MKDIRHIER)" $(dir $@)
+rts/dist/build/sm/Evac_thr.c : rts/sm/Evac.c | $$(dir $$@)/.
 	cp $< $@
-rts/dist/build/sm/Scav_thr.c : rts/sm/Scav.c
-	"$(MKDIRHIER)" $(dir $@)
+rts/dist/build/sm/Scav_thr.c : rts/sm/Scav.c | $$(dir $$@)/.
 	cp $< $@
 
 rts_H_FILES = $(wildcard includes/*.h) $(wildcard rts/*.h)
@@ -173,12 +171,6 @@ ifeq "$(UseLibFFIForAdjustors)" "YES"
 rts_CC_OPTS += -DUSE_LIBFFI_FOR_ADJUSTORS
 endif
 
-ifeq "$(Windows)" "YES"
-# SDM: when compiled with -fasm the RTS currently has bogus references to 
-# __imp_base_ things, so working around for now:
-rts_HC_OPTS += -fvia-C
-endif
-
 ifneq "$(DYNAMIC_RTS)" "YES"
 rts_HC_OPTS += -static
 else
@@ -191,7 +183,7 @@ rts_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
 rts_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
 
 # Otherwise the stack-smash handler gets triggered.
-ifeq "$(TargetOS_CPP)" "openbsd"
+ifneq "$(findstring $(TargetOS_CPP), darwin openbsd)" ""
 rts_HC_OPTS += -optc-fno-stack-protector
 endif
 
@@ -315,13 +307,14 @@ endif
 # a different set of dependencies for each way.  Further hack: PROFILING and
 # TICKY_TICKY can't be used together, so we omit TICKY_TICKY for now.
 rts_MKDEPENDC_OPTS += -DPROFILING -DTHREADED_RTS -DDEBUG
+rts_MKDEPENDC_OPTS += -Irts/sm
 
 rts_WAYS_DASHED = $(subst $(space),,$(patsubst %,-%,$(strip $(rts_WAYS))))
 rts_dist_depfile = rts/dist/build/.depend$(rts_WAYS_DASHED)
 
-rts_dist_C_SRCS  = $(rts_C_SRCS)
+rts_dist_C_SRCS  = $(rts_C_SRCS) $(rts_thr_EXTRA_C_SRCS)
 rts_dist_S_SRCS =  $(rts_S_SRCS)
-rts_dist_C_FILES = $(rts_C_SRCS) $(rts_S_SRCS)
+rts_dist_C_FILES = $(rts_C_SRCS) $(rts_thr_EXTRA_C_SRCS) $(rts_S_SRCS)
 
 $(eval $(call build-dependencies,rts,dist))