X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fghc.mk;h=dd9851a3f0f6b836f4af63293c183dbd2df30a0b;hb=b600039b007e5a1425e264cffc2ddfc74886986e;hp=8b6ecb1ce85503438f76f813c0a8acdc4ceaf4bd;hpb=7a3c2d0e25befca7f83f448c12d5310c2ffd86fa;p=ghc-hetmet.git

diff --git a/rts/ghc.mk b/rts/ghc.mk
index 8b6ecb1..dd9851a 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -37,7 +37,6 @@ endif
 
 EXCLUDED_SRCS += rts/Main.c
 EXCLUDED_SRCS += rts/parallel/SysMan.c
-EXCLUDED_SRCS += rts/dyn-wrapper.c
 EXCLUDED_SRCS += $(wildcard rts/Vis*.c)
 
 rts_C_SRCS = $(filter-out $(EXCLUDED_SRCS),$(wildcard rts/*.c $(foreach dir,$(ALL_DIRS),rts/$(dir)/*.c)))
@@ -252,11 +251,6 @@ rts_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS)
 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.
-ifneq "$(findstring $(TargetOS_CPP), darwin openbsd)" ""
-rts_HC_OPTS += -optc-fno-stack-protector
-endif
-
 # We *want* type-checking of hand-written cmm.
 rts_HC_OPTS += -dcmm-lint 
 
@@ -443,14 +437,6 @@ rts_HSC2HS_OPTS += -Ilibffi/build/include
 rts_LD_OPTS     += -Llibffi/build/include
 
 # -----------------------------------------------------------------------------
-# compile generic patchable dyn-wrapper
-
-DYNWRAPPER_SRC = rts/dyn-wrapper.c
-DYNWRAPPER_PROG = rts/dyn-wrapper$(exeext)
-$(DYNWRAPPER_PROG): $(DYNWRAPPER_SRC)
-	"$(HC)" -cpp -optc-include -optcdyn-wrapper-patchable-behaviour.h $(INPLACE_EXTRA_FLAGS) $< -o $@
-
-# -----------------------------------------------------------------------------
 # compile dtrace probes if dtrace is supported
 
 ifeq "$(HaveDtrace)" "YES"
@@ -469,6 +455,7 @@ endif
 
 ifneq "$(BINDIST)" "YES"
 rts/dist/build/libHSrtsmain.a : rts/dist/build/Main.o
+	"$(RM)" $(RM_OPTS) $@
 	"$(AR)" $(AR_OPTS) $(EXTRA_AR_ARGS) $@ $<
 endif