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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/72e46baf25f757b24e3eb9ebb8f5694d8ca8722e

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

commit 72e46baf25f757b24e3eb9ebb8f5694d8ca8722e
Merge: 1bbdbe5... 4144896...
Author: Simon Peyton Jones <[email protected]>
Date:   Wed Aug 29 07:35:23 2012 +0100

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

 compiler/cmm/CmmParse.y                            | 1058 ++++++++++----------
 compiler/codeGen/CodeGen/Platform.hs               |   40 +-
 compiler/codeGen/CodeGen/Platform/ARM.hs           |    2 -
 compiler/codeGen/CodeGen/Platform/NoRegs.hs        |    2 -
 compiler/codeGen/CodeGen/Platform/PPC.hs           |    2 -
 compiler/codeGen/CodeGen/Platform/PPC_Darwin.hs    |    2 -
 compiler/codeGen/CodeGen/Platform/SPARC.hs         |    2 -
 compiler/codeGen/CodeGen/Platform/X86.hs           |    2 -
 compiler/codeGen/CodeGen/Platform/X86_64.hs        |    2 -
 compiler/coreSyn/CorePrep.lhs                      |   46 +-
 compiler/coreSyn/CoreUtils.lhs                     |   10 +-
 compiler/ghc.cabal.in                              |    1 -
 compiler/ghci/Linker.lhs                           |   67 +-
 compiler/llvmGen/LlvmCodeGen/Ppr.hs                |   59 +-
 compiler/main/DriverPhases.hs                      |   41 +-
 compiler/main/TidyPgm.lhs                          |   23 +-
 compiler/nativeGen/AsmCodeGen.lhs                  |    2 +-
 compiler/nativeGen/PPC/CodeGen.hs                  |   38 +-
 compiler/nativeGen/PPC/Instr.hs                    |   23 +-
 compiler/nativeGen/PPC/Regs.hs                     |  326 +------
 compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs     |   16 +-
 .../nativeGen/RegAlloc/Linear/JoinToTargets.hs     |    2 +-
 compiler/nativeGen/RegAlloc/Linear/Main.hs         |   33 +-
 compiler/nativeGen/RegAlloc/Linear/PPC/FreeRegs.hs |    5 +-
 .../nativeGen/RegAlloc/Linear/SPARC/FreeRegs.hs    |   25 +-
 compiler/nativeGen/SPARC/CodeGen.hs                |   10 +-
 compiler/nativeGen/SPARC/CodeGen/Base.hs           |   11 +-
 compiler/nativeGen/SPARC/CodeGen/Gen32.hs          |    7 +-
 compiler/nativeGen/SPARC/Instr.hs                  |   15 +-
 compiler/nativeGen/SPARC/RegPlate.hs               |  318 ------
 compiler/nativeGen/SPARC/Regs.hs                   |  130 +---
 compiler/nativeGen/X86/CodeGen.hs                  |  157 ++--
 compiler/nativeGen/X86/Instr.hs                    |   24 +-
 compiler/nativeGen/X86/Regs.hs                     |  214 +----
 compiler/utils/Util.lhs                            |   17 +-
 includes/CodeGen.Platform.hs                       |  585 +++++++++++-
 36 files changed, 1510 insertions(+), 1807 deletions(-)



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

Reply via email to