[commit: ghc] wip/rae-new-coercible: Merge commit '668a137' into wip/rae-new-coercible (7f722dd)

[git at git.haskell.org]

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

On branch  : wip/rae-new-coercible
Link       : http://ghc.haskell.org/trac/ghc/changeset/7f722dda26eb4ee252bc8ef66c914935087cea72/ghc

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

commit 7f722dda26eb4ee252bc8ef66c914935087cea72
Merge: b9ffbc6 668a137
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Sun Dec 7 14:23:30 2014 -0500

    Merge commit '668a137' into wip/rae-new-coercible



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

7f722dda26eb4ee252bc8ef66c914935087cea72
 aclocal.m4                                   |   3 +-
 compiler/ghc.mk                              |   3 -
 compiler/hsSyn/HsTypes.lhs                   |   2 +-
 compiler/parser/Parser.y                     |  10 +-
 compiler/rename/RnExpr.lhs                   |   4 +-
 compiler/typecheck/TcTyDecls.lhs             |   9 +-
 compiler/types/TyCon.hs                      | 203 ++++++++++++++++-----------
 compiler/vectorise/Vectorise/Utils/Base.hs   |   6 +-
 compiler/vectorise/Vectorise/Utils/PADict.hs |   3 +-
 docs/users_guide/7.10.1-notes.xml            |   6 +-
 includes/rts/Linker.h                        |   3 -
 libraries/base/Data/Word.hs                  |   6 +-
 rts/CheckUnload.c                            |   4 -
 rts/Linker.c                                 | 175 ++++++++---------------
 rts/LinkerInternals.h                        |   4 -
 testsuite/tests/generics/T5462No1.stderr     |   4 +-
 testsuite/tests/generics/all.T               |   6 +-
 testsuite/tests/polykinds/T7908.hs           |  49 +++++++
 testsuite/tests/polykinds/all.T              |   2 +-
 testsuite/tests/rts/Makefile                 |   8 +-
 testsuite/tests/rts/T2615.hs                 |   1 -
 testsuite/tests/rts/linker_unload.c          |  37 -----
 testsuite/tests/rts/linker_unload.stdout     |   2 +-
 testsuite/tests/rts/rdynamic.hs              |   2 -
 24 files changed, 259 insertions(+), 293 deletions(-)