[commit: ghc] overlapping-tyfams: Merge branch 'master' of http://darcs.haskell.org/ghc (73ab57d)

[Richard Eisenberg]

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

On branch  : overlapping-tyfams

http://hackage.haskell.org/trac/ghc/changeset/73ab57d31ac83d7155881887d03bbbafe0a3353f

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

commit 73ab57d31ac83d7155881887d03bbbafe0a3353f
Merge: df58a15... 190c555...
Author: Richard Eisenberg <eir at seas.upenn.edu>
Date:   Mon Aug 6 11:02:37 2012 -0400

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

 aclocal.m4                                         |   16 +-
 compiler/cmm/Cmm.hs                                |   15 +-
 compiler/cmm/CmmBuildInfoTables.hs                 |   99 ++--
 compiler/cmm/CmmContFlowOpt.hs                     |   82 +++-
 compiler/cmm/CmmCvt.hs                             |    2 +-
 compiler/cmm/CmmInfo.hs                            |   97 ++--
 compiler/cmm/CmmLayoutStack.hs                     |  142 +++--
 compiler/cmm/CmmMachOp.hs                          |    2 +
 compiler/cmm/CmmNode.hs                            |   36 +-
 compiler/cmm/CmmOpt.hs                             |   15 +-
 compiler/cmm/CmmParse.y                            |    2 +-
 compiler/cmm/CmmPipeline.hs                        |  131 +++--
 compiler/cmm/CmmProcPoint.hs                       |   26 +-
 compiler/cmm/CmmSink.hs                            |  582 ++++++++++++++------
 compiler/cmm/MkGraph.hs                            |   27 +-
 compiler/cmm/OldCmm.hs                             |   20 +-
 compiler/cmm/PprC.hs                               |    4 +-
 compiler/cmm/PprCmm.hs                             |    2 +-
 compiler/cmm/PprCmmDecl.hs                         |    2 -
 compiler/codeGen/CgInfoTbls.hs                     |    2 +-
 compiler/codeGen/CgMonad.lhs                       |   13 +-
 compiler/codeGen/StgCmm.hs                         |    7 +-
 compiler/codeGen/StgCmmBind.hs                     |   33 +-
 compiler/codeGen/StgCmmClosure.hs                  |    2 -
 compiler/codeGen/StgCmmExpr.hs                     |  175 +++----
 compiler/codeGen/StgCmmForeign.hs                  |   34 +-
 compiler/codeGen/StgCmmHeap.hs                     |  125 +++--
 compiler/codeGen/StgCmmLayout.hs                   |   33 +-
 compiler/codeGen/StgCmmMonad.hs                    |  138 ++++--
 compiler/codeGen/StgCmmPrim.hs                     |    2 +-
 compiler/codeGen/StgCmmUtils.hs                    |    2 +-
 compiler/coreSyn/CoreUtils.lhs                     |    2 +-
 compiler/deSugar/Coverage.lhs                      |    9 +-
 compiler/deSugar/Desugar.lhs                       |    3 +-
 compiler/ghc.mk                                    |   12 -
 compiler/hsSyn/HsExpr.lhs                          |    2 +-
 compiler/hsSyn/HsSyn.lhs                           |   77 ++--
 compiler/iface/MkIface.lhs                         |    8 +-
 compiler/llvmGen/LlvmCodeGen.hs                    |    4 +-
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs            |    5 +-
 compiler/main/DriverPipeline.hs                    |   32 +-
 compiler/main/DynFlags.hs                          |   13 +-
 compiler/main/HscMain.hs                           |    2 +-
 compiler/main/SysTools.lhs                         |  288 +++++-----
 compiler/nativeGen/AsmCodeGen.lhs                  |   63 ++-
 compiler/nativeGen/Instruction.hs                  |    4 +-
 compiler/nativeGen/PPC/Ppr.hs                      |   71 ++--
 compiler/nativeGen/PprInstruction.hs               |    2 -
 .../nativeGen/RegAlloc/Linear/JoinToTargets.hs     |   14 +-
 compiler/nativeGen/RegAlloc/Linear/Main.hs         |   83 ++-
 compiler/nativeGen/RegAlloc/Liveness.hs            |    4 +-
 compiler/nativeGen/SPARC/Ppr.hs                    |   74 ++--
 compiler/nativeGen/X86/Ppr.hs                      |   97 ++--
 compiler/simplCore/FloatOut.lhs                    |    2 +-
 compiler/simplCore/Simplify.lhs                    |  374 ++++++-------
 compiler/stgSyn/StgSyn.lhs                         |   10 +-
 compiler/utils/Fingerprint.hsc                     |    7 -
 compiler/utils/Outputable.lhs                      |   32 +-
 compiler/utils/UniqFM.lhs                          |  175 +++---
 compiler/vectorise/Vectorise/Generic/PADict.hs     |    6 +-
 configure.ac                                       |   10 +-
 distrib/configure.ac.in                            |    9 +
 docs/users_guide/intro.xml                         |   14 +-
 includes/Rts.h                                     |    2 +
 includes/ghc.mk                                    |    2 +-
 includes/mkDerivedConstants.c                      |   25 +
 mk/config.mk.in                                    |    5 -
 rts/Linker.c                                       |    2 +
 rts/parallel/Pack.c                                |    4 +-
 rts/posix/Select.c                                 |   15 +-
 settings.in                                        |    4 +
 71 files changed, 2050 insertions(+), 1385 deletions(-)