projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tracing wibble (make -ls work with a -debug RTS)
[ghc-hetmet.git]
/
rts
/
ghc.mk
diff --git
a/rts/ghc.mk
b/rts/ghc.mk
index
9c33896
..
aee28ba
100644
(file)
--- 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_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 $< $@
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)
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
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
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.
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
rts_HC_OPTS += -optc-fno-stack-protector
endif