[commit: ghc] wip/ttypeable: Fixes (ac90630)

[git at git.haskell.org]

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

On branch  : wip/ttypeable
Link       : http://ghc.haskell.org/trac/ghc/changeset/ac90630d632a34c9ec8b5f5552f01f9719e4004a/ghc

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

commit ac90630d632a34c9ec8b5f5552f01f9719e4004a
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Jan 19 21:12:11 2017 -0500

    Fixes


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

ac90630d632a34c9ec8b5f5552f01f9719e4004a
 compiler/typecheck/TcTypeable.hs | 3 +--
 libraries/Cabal                  | 2 +-
 libraries/hpc                    | 2 +-
 libraries/time                   | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/compiler/typecheck/TcTypeable.hs b/compiler/typecheck/TcTypeable.hs
index e160142..b33dff7 100644
--- a/compiler/typecheck/TcTypeable.hs
+++ b/compiler/typecheck/TcTypeable.hs
@@ -371,8 +371,7 @@ which looks like,
 
 Note how $trProxyType encodes only the kind variables of the TyCon
 instantiation. To compute the kind (Proxy Int) we need to have a recipe to
-compute the kind of a concrete instantiation of Proxy. We call"inplace/bin/ghc-stage1" -hisuf hi -osuf  o -hcsuf hc -static  -O -H64m -Wall      -this-unit-id ghc-prim-0.5.0.0 -hide-all-packages -i -ilibraries/ghc-prim/. -ilibraries/ghc-prim/dist-install/build -Ilibraries/ghc-prim/dist-install/build -ilibraries/ghc-prim/dist-install/build/./autogen -Ilibraries/ghc-prim/dist-install/build/./autogen -Ilibraries/ghc-prim/.    -optP-include -optPlibraries/ghc-prim/dist-install/build/./autogen/cabal_macros.h -package-id rts -this-unit-id ghc-prim -XHaskell2010 -O -dcore-lint  -no-user-package-db -rtsopts -Wno-trustworthy-safe -Wno-deprecated-flags     -Wnoncanonical-monad-instances  -odir libraries/ghc-prim/dist-install/build -hidir libraries/ghc-prim/dist-install/build -stubdir libraries/ghc-prim/dist-install/build  -split-sections -dynamic-too -c libraries/ghc-prim/./GHC/Types.hs -o libraries/ghc-prim/dist-install/build/GHC/Types.o -dyno libraries/ghc-prim/dist-install/build/GHC/Types.
 dyn_o
- this recipe a
+compute the kind of a concrete instantiation of Proxy. We call this recipe a
 KindRep and store it in the TyCon produced for Proxy,
 
     type KindBndr = Int   -- de Bruijn index
diff --git a/libraries/Cabal b/libraries/Cabal
index 824d0ba..d8fbdd6 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 824d0bae1aee2a25cabdcef92e5e1dd470c7dac0
+Subproject commit d8fbdd6bab216aee3f36a8e46fadf1040425b023
diff --git a/libraries/hpc b/libraries/hpc
index 8625c1c..c23cad3 160000
--- a/libraries/hpc
+++ b/libraries/hpc
@@ -1 +1 @@
-Subproject commit 8625c1c0550719437acad89d49401cf048990084
+Subproject commit c23cad32f408559ba95b880c04dc1a2c60ec3d01
diff --git a/libraries/time b/libraries/time
index ee8fe45..b6098be 160000
--- a/libraries/time
+++ b/libraries/time
@@ -1 +1 @@
-Subproject commit ee8fe452fa45f6d78f8ce6deedb88b20eb3d5f42
+Subproject commit b6098be8a4facfa854c633f2a3a82ab8e72962ef