Tweak alternative layout rule

[ghc-hetmet.git] / rts / ghc.mk

diff --git a/rts/ghc.mk b/rts/ghc.mk
index 0cb279a..b238728 100644 (file)
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -103,7 +103,7 @@ rts/dist/build/win32/libHS$1.def : rts/win32/libHS$1.def
                | sed "s/@LibVersion@/$$(libraries/$1_dist-install_VERSION)/" \
                | sed "s/@ProjectVersion@/$(ProjectVersion)/" \
                > rts/dist/build/win32/libHS$1.def
-               
+
 rts/dist/build/win32/libHS$1.dll.a : rts/dist/build/win32/libHS$1.def
        "$$(DLLTOOL)"   -d rts/dist/build/win32/libHS$1.def \
                        -l rts/dist/build/win32/libHS$1.dll.a
@@ -116,7 +116,7 @@ rts/dist/build/win32/libHSffi.def : rts/win32/libHSffi.def
        cat rts/win32/libHSffi.def \
                | sed "s/@ProjectVersion@/$(ProjectVersion)/" \
                > rts/dist/build/win32/libHSffi.def
-               
+
 rts/dist/build/win32/libHSffi.dll.a : rts/dist/build/win32/libHSffi.def
        "$(DLLTOOL)"    -d rts/dist/build/win32/libHSffi.def \
                        -l rts/dist/build/win32/libHSffi.dll.a
@@ -207,7 +207,6 @@ WARNING_OPTS += -Winline
 WARNING_OPTS += -Waggregate-return
 WARNING_OPTS += -Wpointer-arith
 WARNING_OPTS += -Wmissing-noreturn
-WARNING_OPTS += -Wcast-align
 WARNING_OPTS += -Wnested-externs
 WARNING_OPTS += -Wredundant-decls 
 
@@ -217,6 +216,15 @@ WARNING_OPTS += -Wredundant-decls
 #WARNING_OPTS += -Wshadow
 #WARNING_OPTS += -Wcast-qual
 
+# This one seems buggy on GCC 4.1.2, which is the only GCC version we 
+# have that can bootstrap the SPARC build. We end up with lots of supurious
+# warnings of the form "cast increases required alignment of target type".
+# Some legitimate warnings can be fixed by adding an intermediate cast to
+# (void*), but we get others in rts/sm/GCUtils.c concerning the gct var
+# that look innocuous to me. We could enable this again once we deprecate
+# support for registerised builds on this arch. -- BL 2010/02/03
+# WARNING_OPTS += -Wcast-align
+
 STANDARD_OPTS += -Iincludes -Irts
 # COMPILING_RTS is only used when building Win32 DLL support.
 STANDARD_OPTS += -DCOMPILING_RTS
@@ -315,7 +323,6 @@ rts/RetainerSet_CC_OPTS += -Wno-format
 # On Windows:
 rts/win32/ConsoleHandler_CC_OPTS += -w
 rts/win32/ThrIOManager_CC_OPTS += -w
-rts/win32/Ticker_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