[commit: ghc] ghc-new-co: Merge in changes from HEAD (db4f42a)

[Simon Peyton Jones]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : ghc-new-co

http://hackage.haskell.org/trac/ghc/changeset/db4f42a8e38bfead11f5af78557e18b9f42b10b3

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

commit db4f42a8e38bfead11f5af78557e18b9f42b10b3
Merge: 15bea1b... 25fa4bd...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon May 2 10:25:36 2011 +0100

    Merge in changes from HEAD

 .gitignore                           |   20 ++++++++++++++--
 compiler/cmm/CLabel.hs               |   12 ++++++++-
 compiler/cmm/PprC.hs                 |    2 +-
 compiler/deSugar/Coverage.lhs        |   16 ++++++++++++-
 compiler/hsSyn/HsBinds.lhs           |    8 +-----
 compiler/llvmGen/LlvmCodeGen/Regs.hs |    2 +
 compiler/main/StaticFlagParser.hs    |    1 -
 compiler/rename/RnBinds.lhs          |    2 +-
 compiler/rename/RnEnv.lhs            |   13 ++++++++++-
 compiler/rename/RnExpr.lhs           |   11 +++-----
 compiler/typecheck/TcBinds.lhs       |   22 +++++-------------
 compiler/typecheck/TcDeriv.lhs       |   12 +++++----
 compiler/typecheck/TcGenDeriv.lhs    |   31 +++++++++++++++----------
 compiler/typecheck/TcSMonad.lhs      |   41 ++++++++++++++++++---------------
 compiler/typecheck/TcSimplify.lhs    |   24 +++++++++++--------
 compiler/types/OptCoercion.lhs       |    7 ++++-
 compiler/types/TypeRep.lhs           |   14 ++++++-----
 ghc/ghc.mk                           |   24 ++++++++++---------
 18 files changed, 157 insertions(+), 105 deletions(-)


Diff suppressed because of size. To see it, use:

    git show db4f42a8e38bfead11f5af78557e18b9f42b10b3