X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FMakefile;h=c13e49c903f6827ec1fc97e6853180a51b3c7803;hb=0981e24e9980b8b26e6f20fc56bebc1c7416cc4f;hp=9af9671a0e11b81389c10425b3451d68913d7501;hpb=861cfcf09aba53e4bb20bfd1eaa23d7b5ba14e76;p=ghc-hetmet.git

diff --git a/rts/Makefile b/rts/Makefile
index 9af9671..c13e49c 100644
--- a/rts/Makefile
+++ b/rts/Makefile
@@ -156,6 +156,12 @@ else
 DQ = \"
 endif
 
+# If Main.c is built with optimisation then the SEH exception stuff on
+# Windows gets confused.
+# This has to be in HC rather than CC opts, as otherwise there's a
+# -optc-O2 that comes after it.
+Main_HC_OPTS += -optc-O0
+
 RtsMessages_CC_OPTS += -DProjectVersion=$(DQ)$(ProjectVersion)$(DQ)
 RtsUtils_CC_OPTS += -DProjectVersion=$(DQ)$(ProjectVersion)$(DQ)
 RtsUtils_CC_OPTS += -DRtsWay=$(DQ)rts$(_way)$(DQ)
@@ -165,6 +171,23 @@ RtsUtils_CC_OPTS += -DTargetPlatform=$(DQ)$(TARGETPLATFORM)$(DQ)
 RtsUtils_CC_OPTS += -DGhcUnregisterised=$(DQ)$(GhcUnregisterised)$(DQ)
 RtsUtils_CC_OPTS += -DGhcEnableTablesNextToCode=$(DQ)$(GhcEnableTablesNextToCode)$(DQ)
 
+StgCRun_CC_OPTS += -w
+Typeable_CC_OPTS += -w
+RetainerProfile_CC_OPTS += -w
+sm/Compact_CC_OPTS += -w
+# On Windows:
+win32/ConsoleHandler_CC_OPTS += -w
+win32/ThrIOManager_CC_OPTS += -w
+win32/Ticker_CC_OPTS += -w
+Threads_CC_OPTS += -w
+Capability_CC_OPTS += -w
+Schedule_CC_OPTS += -w
+# The above warning supression flags are a temporary kludge.
+# While working on this module you are encouraged to remove it and fix
+# any warnings in the module. See
+#     http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings
+# for details
+
 ifeq "$(way)" "mp"
 SRC_HC_OPTS += -I$$PVM_ROOT/include
 endif