[commit: ghc] master: Bump Cabal and Haddock to fix #11308 (89ba83d)

[git at git.haskell.org]

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

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

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

commit 89ba83d981df3e56809440764cf81773bc33d00a
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Jan 6 14:42:22 2016 +0100

    Bump Cabal and Haddock to fix #11308
    
    Bump Cabal and Haddock submodules such that they both support GCC-style
    response files on Windows.


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

89ba83d981df3e56809440764cf81773bc33d00a
 libraries/Cabal                 | 2 +-
 testsuite/tests/driver/T4437.hs | 8 +-------
 utils/haddock                   | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index bf4d05e..a8a121e 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit bf4d05efa79a41a819e3d9278d5e9e1e5a055ce7
+Subproject commit a8a121ea4d78783dd303dd2992d8e73ef337e7ed
diff --git a/testsuite/tests/driver/T4437.hs b/testsuite/tests/driver/T4437.hs
index 4120e91..f345ce6 100644
--- a/testsuite/tests/driver/T4437.hs
+++ b/testsuite/tests/driver/T4437.hs
@@ -32,13 +32,7 @@ check title expected got
 expectedGhcOnlyExtensions :: [String]
 expectedGhcOnlyExtensions = ["RelaxedLayout",
                              "AlternativeLayoutRule",
-                             "AlternativeLayoutRuleTransitional",
-                             "OverloadedLabels",
-                             "UndecidableSuperClasses",
-                             "TemplateHaskellQuotes",
-                             "MonadFailDesugaring",
-                             "TypeInType",
-                             "TypeApplications"]
+                             "AlternativeLayoutRuleTransitional"]
 
 expectedCabalOnlyExtensions :: [String]
 expectedCabalOnlyExtensions = ["Generics",
diff --git a/utils/haddock b/utils/haddock
index 6ddd758..a13d21c 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 6ddd758be0e7b50bd19d33400b3c3013d60786cb
+Subproject commit a13d21c688cae176be4505a5a6e9d64739845ea3