[commit: ghc] master: Update haddock submodule, and fix haddock input file from genprimopcode (d57f507)

[git at git.haskell.org]

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

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

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

commit d57f507f6961494a23d88f748c030c5346250a3c
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Jan 6 16:43:52 2015 +0000

    Update haddock submodule, and fix haddock input file from genprimopcode
    
    * A module in haddock an unused constraint, now fixed and pushed to ghc-head
      This patch records the new commit in GHC repo
    
    * genprimopcode generates a dummy Prim.hs for haddock.  But then Haddock was
      complaining about redundant constraints.  So this patch makes genprimopcode
      generate a warning-suppression OPTIONS_GHC pragma in Prim.hs


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

d57f507f6961494a23d88f748c030c5346250a3c
 utils/genprimopcode/Main.hs | 6 ++++++
 utils/haddock               | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/utils/genprimopcode/Main.hs b/utils/genprimopcode/Main.hs
index 67c2131..7d5205a 100644
--- a/utils/genprimopcode/Main.hs
+++ b/utils/genprimopcode/Main.hs
@@ -245,6 +245,12 @@ gen_hs_source (Info defaults entries) =
         ++ "{-# LANGUAGE MultiParamTypeClasses #-}\n"
         ++ "{-# LANGUAGE NoImplicitPrelude #-}\n"
         ++ "{-# LANGUAGE UnboxedTuples #-}\n"
+        ++ "{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}\n"
+                -- We generate a binding for coerce, like
+                --   coerce :: Coercible a b => a -> b
+                --   coerce = let x = x in x
+                -- and we don't want a complaint that the constraint is redundant
+                -- Remember, this silly file is only for Haddock's consumption
         ++ "module GHC.Prim (\n"
         ++ unlines (map (("        " ++) . hdr) entries')
         ++ ") where\n"
diff --git a/utils/haddock b/utils/haddock
index 56b9e6b..8b1d44f 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 56b9e6bcef33612b40d3f93f170397eff77411eb
+Subproject commit 8b1d44fbdde141cf883f5ddcd337bbbab8433228