[commit: ghc] ghc-lwc2: Merging master (b5372eb)

[Sivaramakrishnan Krishnamoorthy Chandrasekaran]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : ghc-lwc2

https://github.com/ghc/ghc/commit/b5372ebb68414ffb22ed8e842ecad36502bff583

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

commit b5372ebb68414ffb22ed8e842ecad36502bff583
Merge: 1f1f92c d75ca39
Author: KC Sivaramakrishnan <chandras at cs.purdue.edu>
Date:   Tue Apr 30 15:26:05 2013 -0400

    Merging master

 compiler/basicTypes/OccName.lhs      |   2 +-
 compiler/cmm/CLabel.hs               |   4 +-
 compiler/cmm/CmmLayoutStack.hs       |   4 +-
 compiler/cmm/CmmParse.y              |   5 +-
 compiler/cmm/PprC.hs                 |  34 ++++-------
 compiler/codeGen/StgCmmBind.hs       |   2 +-
 compiler/codeGen/StgCmmExtCode.hs    |  17 +++---
 compiler/codeGen/StgCmmPrim.hs       |   5 +-
 compiler/codeGen/StgCmmUtils.hs      |  11 ++--
 compiler/coreSyn/MkExternalCore.lhs  |  46 ++++++--------
 compiler/deSugar/Match.lhs           |   2 +-
 compiler/hsSyn/HsBinds.lhs           |   8 +--
 compiler/iface/IfaceSyn.lhs          |  14 ++---
 compiler/iface/MkIface.lhs           |  12 ++--
 compiler/iface/TcIface.lhs           |   4 +-
 compiler/llvmGen/Llvm/AbsSyn.hs      |  16 ++---
 compiler/main/CodeOutput.lhs         |   4 +-
 compiler/main/DriverPipeline.hs      | 115 +++++++++++++++++------------------
 compiler/main/DynFlags.hs            |   8 +--
 compiler/main/GHC.hs                 |   8 ++-
 compiler/main/HscMain.hs             |  39 ++++++------
 compiler/main/StaticFlags.hs         |  77 ++++++++---------------
 compiler/simplCore/FloatIn.lhs       |   2 +-
 compiler/typecheck/FamInst.lhs       |  10 +--
 compiler/typecheck/TcErrors.lhs      |  23 ++++++-
 compiler/typecheck/TcExpr.lhs        |  47 +++++++++-----
 compiler/typecheck/TcGenGenerics.lhs |   4 +-
 compiler/typecheck/TcHsType.lhs      |  31 +++++++---
 compiler/typecheck/TcRnTypes.lhs     |   2 +-
 compiler/typecheck/TcSimplify.lhs    |   6 +-
 compiler/typecheck/TcSplice.lhs      |   2 +-
 compiler/typecheck/TcUnify.lhs       |   9 ++-
 compiler/typecheck/TcValidity.lhs    |  16 ++---
 compiler/types/CoAxiom.lhs           |   2 +-
 compiler/types/FamInstEnv.lhs        | 112 +++++++++++++++++++---------------
 compiler/types/OptCoercion.lhs       |   2 +-
 compiler/types/Unify.lhs             |  18 +++++-
 compiler/utils/Platform.hs           |   8 +++
 docs/comm/the-beast/data-types.html  |   4 +-
 docs/core-spec/Makefile              |   2 +-
 ghc/Main.hs                          |   2 -
 libraries/Cabal                      |   2 +-
 mk/config.mk.in                      |   4 ++
 rts/Linker.c                         |   1 +
 rts/StgCRun.c                        |  37 ++++++++---
 rts/Threads.c                        |   4 +-
 rts/ghc.mk                           |  12 ++--
 rts/package.conf.in                  |   7 ++-
 rules/distdir-way-opts.mk            |   4 +-
 utils/ghc-cabal/ghc.mk               |   2 +-
 utils/ghc-pkg/Main.hs                |  32 +++-------
 51 files changed, 450 insertions(+), 394 deletions(-)


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

    git show b5372ebb68414ffb22ed8e842ecad36502bff583