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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/1459bd2ebe1427ac28d262347ee3b2de098b7a3b

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

commit 1459bd2ebe1427ac28d262347ee3b2de098b7a3b
Merge: e91c7ea... c21e57b...
Author: Simon Peyton Jones <[email protected]>
Date:   Mon Jul 18 09:12:15 2011 +0100

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

 compiler/main/DriverPipeline.hs                    |   12 ++-
 compiler/nativeGen/AsmCodeGen.lhs                  |   19 ++--
 compiler/nativeGen/Instruction.hs                  |   10 +-
 compiler/nativeGen/NCGMonad.hs                     |   16 ++-
 compiler/nativeGen/PPC/CodeGen.hs                  |   12 +-
 compiler/nativeGen/PPC/Instr.hs                    |   47 ++++---
 compiler/nativeGen/PPC/Ppr.hs                      |  140 ++++++++++----------
 compiler/nativeGen/RegAlloc/Graph/Main.hs          |   15 +-
 compiler/nativeGen/RegAlloc/Graph/SpillClean.hs    |   97 +++++++-------
 compiler/nativeGen/RegAlloc/Graph/Stats.hs         |   16 +-
 compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs |   23 ++--
 compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs     |    9 +-
 .../nativeGen/RegAlloc/Linear/JoinToTargets.hs     |   96 +++++++-------
 compiler/nativeGen/RegAlloc/Linear/Main.hs         |   73 ++++++-----
 compiler/nativeGen/RegAlloc/Linear/StackMap.hs     |    5 +-
 compiler/nativeGen/RegAlloc/Linear/State.hs        |   17 ++-
 compiler/nativeGen/RegAlloc/Liveness.hs            |   14 +-
 compiler/nativeGen/SPARC/CodeGen.hs                |   19 ++--
 compiler/nativeGen/SPARC/CodeGen/CCall.hs          |   19 ++-
 compiler/nativeGen/SPARC/CodeGen/Gen64.hs          |    9 +-
 compiler/nativeGen/SPARC/Instr.hs                  |   42 ++++---
 compiler/nativeGen/TargetReg.hs                    |   46 +++----
 compiler/nativeGen/X86/CodeGen.hs                  |    7 +-
 compiler/nativeGen/X86/Instr.hs                    |   38 +++---
 compiler/nativeGen/X86/RegInfo.hs                  |   21 ++--
 ghc.mk                                             |    4 +
 sync-all                                           |   50 +++++++-
 27 files changed, 484 insertions(+), 392 deletions(-)



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

Reply via email to