[commit: ghc] master: Enable non-canonical Monad instance warnings for stage1/2 (51d08d8)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/51d08d82b7681d23d89e6c240ec4dcfd8801edb1/ghc

>---------------------------------------------------------------

commit 51d08d82b7681d23d89e6c240ec4dcfd8801edb1
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Dec 5 09:59:01 2015 +0100

    Enable non-canonical Monad instance warnings for stage1/2
    
    This makes use of the new facility introduced via
    14d0f7f1221db758cd06a69f53803d9d0150164a which allows
    to have certain flags passed only to the non-bootstrapping
    GHC. This is needed because sometimes we can't assume the
    existence of a certain flag in the bootstrapping compiler
    which was only added recently to GHC HEAD.
    
    This also updates the haddock submodule to fix a few
    remaining noncanonical instance definitions.
    
    Differential Revision: https://phabricator.haskell.org/D1571


>---------------------------------------------------------------

51d08d82b7681d23d89e6c240ec4dcfd8801edb1
 mk/warnings.mk | 2 ++
 utils/haddock  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mk/warnings.mk b/mk/warnings.mk
index d604f9a..f8db8fd 100644
--- a/mk/warnings.mk
+++ b/mk/warnings.mk
@@ -32,6 +32,8 @@ SRC_CC_WARNING_OPTS += -Wno-unknown-pragmas
 
 endif
 
+SRC_HC_WARNING_OPTS_STAGE1 += -fwarn-noncanonical-monad-instances
+SRC_HC_WARNING_OPTS_STAGE2 += -fwarn-noncanonical-monad-instances
 
 
 ######################################################################
diff --git a/utils/haddock b/utils/haddock
index 42b2cfc..a6deefa 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 42b2cfc595f1ee62d1c1b8513c5df1d92709c06a
+Subproject commit a6deefad581cbeb62048826bc1d626c41a0dd56c