Fix and supress some warnings, and turn on -Werror when validating

6 files changed, 41 insertions, 4 deletions

diff --git a/rts/Makefile b/rts/Makefile
index 7fab5fa068..4e1c915e50 100644
--- a/rts/Makefile
+++ b/rts/Makefile
@@ -171,6 +171,16 @@ 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
+# 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
diff --git a/rts/Schedule.c b/rts/Schedule.c
index afd8c28a08..8bd42414b5 100644
--- a/rts/Schedule.c
+++ b/rts/Schedule.c
@@ -2577,7 +2577,12 @@ initScheduler(void)
 }
 
 void
-exitScheduler( rtsBool wait_foreign )
+exitScheduler(
+    rtsBool wait_foreign
+#if !defined(THREADED_RTS)
+                         __attribute__((unused))
+#endif
+)
                /* see Capability.c, shutdownCapability() */
 {
     Task *task = NULL;
diff --git a/utils/genapply/GenApply.hs b/utils/genapply/GenApply.hs
index e46b37afcf..fe792a1163 100644
--- a/utils/genapply/GenApply.hs
+++ b/utils/genapply/GenApply.hs
@@ -1,4 +1,10 @@
 {-# OPTIONS -cpp -fglasgow-exts #-}
+{-# OPTIONS_GHC -w #-}
+-- The above warning supression flag is 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
 module Main(main) where
 
 #include "../../includes/ghcconfig.h"
diff --git a/utils/genprimopcode/Parser.y b/utils/genprimopcode/Parser.y
index a949765526..07f1a84863 100644
--- a/utils/genprimopcode/Parser.y
+++ b/utils/genprimopcode/Parser.y
@@ -1,5 +1,12 @@
 
 {
+{-# OPTIONS_GHC -w #-}
+-- The above warning supression flag is 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
+
 module Parser (parse) where
 
 import Lexer (lex_tok)
diff --git a/utils/hpc/HpcParser.y b/utils/hpc/HpcParser.y
index 3f7443771b..c18e053c15 100644
--- a/utils/hpc/HpcParser.y
+++ b/utils/hpc/HpcParser.y
@@ -1,4 +1,11 @@
 { 
+{-# OPTIONS_GHC -w #-}
+-- The above warning supression flag is 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
+
 module HpcParser where
 
 import HpcLexer
diff --git a/validate b/validate
index 9ab5e0d970..cb9b307f8a 100644
--- a/validate
+++ b/validate
@@ -11,9 +11,11 @@ if [ -f mk/build.mk ]; then
 fi
 
 # The default is a "quick" build
-echo BuildFlavour=quick >  mk/build.mk
-echo HADDOCK_DOCS=YES   >> mk/build.mk
-cat mk/build.mk.sample  >> mk/build.mk
+echo "BuildFlavour = quick"   >  mk/build.mk
+echo "HADDOCK_DOCS = YES"     >> mk/build.mk
+cat mk/build.mk.sample        >> mk/build.mk
+echo "SRC_HC_OPTS += -Werror" >> mk/build.mk
+echo "SRC_CC_OPTS += -Werror" >> mk/build.mk
 
 # You can override the default validate settings using mk/validate.mk
 # e.g. you could add GhcLibWays=p to test profiling.