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

2 files changed, 6 insertions, 0 deletions

diff --git a/utils/genprimopcode/Main.hs b/utils/genprimopcode/Main.hs
index 67c2131638..7d5205ad9a 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
-Subproject 56b9e6bcef33612b40d3f93f170397eff77411e
+Subproject 8b1d44fbdde141cf883f5ddcd337bbbab843322