[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc (322044b)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/322044b2670fe9dca22122dbf4cc79fa29b4442c

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

commit 322044b2670fe9dca22122dbf4cc79fa29b4442c
Merge: fb0769b... 0f69338...
Author: Ian Lynagh <igloo at earth.li>
Date:   Thu Jul 19 20:38:05 2012 +0100

    Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc

 compiler/cmm/CmmBuildInfoTables.hs            |  186 +++++++++-----
 compiler/cmm/CmmLayoutStack.hs                |   99 +------
 compiler/cmm/CmmPipeline.hs                   |   91 ++-----
 compiler/cmm/CmmSink.hs                       |  256 ++++++++++++++++++
 compiler/cmm/PprCmm.hs                        |   13 +-
 compiler/deSugar/Coverage.lhs                 |    7 +
 compiler/deSugar/DsExpr.lhs                   |   22 ++
 compiler/deSugar/DsGRHSs.lhs                  |   10 +-
 compiler/deSugar/DsMeta.hs                    |   99 ++++---
 compiler/deSugar/Match.lhs                    |    1 +
 compiler/ghc.cabal.in                         |    1 +
 compiler/hsSyn/Convert.lhs                    |   10 +
 compiler/hsSyn/HsDecls.lhs                    |    2 +-
 compiler/hsSyn/HsExpr.lhs                     |   22 ++-
 compiler/iface/IfaceType.lhs                  |    7 +-
 compiler/main/DynFlags.hs                     |    6 +-
 compiler/main/ErrUtils.lhs                    |   15 +-
 compiler/parser/Lexer.x                       |   85 +++++--
 compiler/parser/Parser.y.pp                   |   14 +-
 compiler/rename/RnBinds.lhs                   |    2 +-
 compiler/rename/RnExpr.lhs                    |   10 +-
 compiler/simplCore/SimplCore.lhs              |    2 +-
 compiler/simplCore/Simplify.lhs               |   19 +-
 compiler/specialise/Rules.lhs                 |    2 +-
 compiler/typecheck/TcCanonical.lhs            |   36 ++--
 compiler/typecheck/TcDeriv.lhs                |    2 +-
 compiler/typecheck/TcExpr.lhs                 |   13 +
 compiler/typecheck/TcHsSyn.lhs                |   14 +
 compiler/typecheck/TcMatches.lhs              |    8 +-
 compiler/typecheck/TcSMonad.lhs               |  155 +++++++-----
 compiler/typecheck/TcSimplify.lhs             |  294 +++++++++++++--------
 compiler/typecheck/TcTyClsDecls.lhs           |    6 +-
 compiler/utils/Outputable.lhs                 |   10 +-
 docs/users_guide/flags.xml                    |   12 +
 docs/users_guide/glasgow_exts.xml             |   42 +++
 ghc.mk                                        |    6 +-
 ghc/ghc-cross.wrapper                         |    1 +
 includes/Cmm.h                                |    4 +-
 includes/mkDerivedConstants.cross.awk         |  350 +++++++++++++++++++++++++
 includes/mkSizeMacros.cross.awk               |   82 ++++++
 includes/rts/prof/CCS.h                       |    4 +-
 includes/stg/Regs.h                           |   10 +-
 libraries/bin-package-db/bin-package-db.cabal |    2 +-
 libraries/tarballs/time-1.4.0.1.tar.gz        |  Bin 0 -> 87466 bytes
 libraries/tarballs/time-1.4.tar.gz            |  Bin 87054 -> 0 bytes
 rules/{all-target.mk => cross-compiling.mk}   |   18 +-
 utils/genapply/GenApply.hs                    |    6 +-
 utils/ghc-cabal/ghc-cabal.cabal               |    2 +-
 utils/ghc-pkg/Main.hs                         |    2 +
 utils/hpc/HpcMarkup.hs                        |   22 ++-
 utils/hpc/hpc-bin.cabal                       |    6 +-
 51 files changed, 1537 insertions(+), 551 deletions(-)