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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/1e9a2d34ae6996b6872ee4cc87bc8218360fcaf9

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

commit 1e9a2d34ae6996b6872ee4cc87bc8218360fcaf9
Merge: 5a8ac0f... 2b015ce...
Author: Simon Peyton Jones <[email protected]>
Date:   Wed Jun 13 17:26:56 2012 +0100

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

 compiler/cmm/CLabel.hs                         |  102 ++++++++++++------------
 compiler/cmm/CmmBuildInfoTables.hs             |   20 ++---
 compiler/cmm/CmmInfo.hs                        |    2 +-
 compiler/cmm/CmmPipeline.hs                    |    4 +-
 compiler/codeGen/StgCmmBind.hs                 |   10 +--
 compiler/codeGen/StgCmmClosure.hs              |   21 +++---
 compiler/codeGen/StgCmmHeap.hs                 |    9 +--
 compiler/codeGen/StgCmmLayout.hs               |    6 +-
 compiler/codeGen/StgCmmTicky.hs                |    3 +-
 compiler/nativeGen/AsmCodeGen.lhs              |    2 +-
 compiler/nativeGen/RegAlloc/Graph/Main.hs      |    4 +-
 compiler/nativeGen/RegAlloc/Graph/SpillCost.hs |    6 +-
 compiler/nativeGen/RegAlloc/Liveness.hs        |    9 +-
 13 files changed, 90 insertions(+), 108 deletions(-)



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to