Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/bb43ee6aa9953bf09c463c545bd268cb7de6c727 >--------------------------------------------------------------- commit bb43ee6aa9953bf09c463c545bd268cb7de6c727 Merge: 2c9df42... 2aa4062... Author: Ian Lynagh <[email protected]> Date: Tue Jul 5 20:41:09 2011 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/basicTypes/BasicTypes.lhs | 12 +++ compiler/cmm/CLabel.hs | 6 ++- compiler/cmm/Cmm.hs | 4 +- compiler/cmm/CmmBuildInfoTables.hs | 4 +- compiler/cmm/CmmDecl.hs | 9 +-- compiler/cmm/CmmParse.y | 19 +++--- compiler/cmm/OldCmm.hs | 8 +- compiler/cmm/PprC.hs | 18 +---- compiler/cmm/PprCmmDecl.hs | 14 +++-- compiler/codeGen/CgHpc.hs | 6 +- compiler/codeGen/CgMonad.lhs | 2 +- compiler/codeGen/CgUtils.hs | 14 ++-- compiler/codeGen/CodeGen.lhs | 2 +- compiler/codeGen/StgCmm.hs | 2 +- compiler/codeGen/StgCmmHpc.hs | 11 ++-- compiler/codeGen/StgCmmMonad.hs | 2 +- compiler/codeGen/StgCmmUtils.hs | 14 ++-- compiler/llvmGen/LlvmCodeGen.hs | 2 +- compiler/llvmGen/LlvmCodeGen/Base.hs | 2 +- compiler/llvmGen/LlvmCodeGen/Data.hs | 13 +--- compiler/llvmGen/LlvmCodeGen/Ppr.hs | 4 +- compiler/nativeGen/AsmCodeGen.lhs | 82 +++++++++++----------- compiler/nativeGen/Instruction.hs | 6 +- compiler/nativeGen/PIC.hs | 11 ++-- compiler/nativeGen/PPC/CodeGen.hs | 19 +++--- compiler/nativeGen/PPC/Instr.hs | 2 +- compiler/nativeGen/PPC/Ppr.hs | 23 ++----- compiler/nativeGen/PPC/RegInfo.hs | 22 ++++-- compiler/nativeGen/RegAlloc/Graph/Coalesce.hs | 6 +- compiler/nativeGen/RegAlloc/Graph/Main.hs | 12 ++-- compiler/nativeGen/RegAlloc/Graph/Spill.hs | 12 ++-- compiler/nativeGen/RegAlloc/Graph/SpillClean.hs | 10 ++-- compiler/nativeGen/RegAlloc/Graph/SpillCost.hs | 2 +- compiler/nativeGen/RegAlloc/Graph/Stats.hs | 32 +++++----- compiler/nativeGen/RegAlloc/Linear/Main.hs | 4 +- compiler/nativeGen/RegAlloc/Linear/Stats.hs | 4 +- compiler/nativeGen/RegAlloc/Liveness.hs | 36 +++++----- compiler/nativeGen/SPARC/CodeGen.hs | 8 +- compiler/nativeGen/SPARC/CodeGen/Expand.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/Gen32.hs | 10 +-- compiler/nativeGen/SPARC/Instr.hs | 2 +- compiler/nativeGen/SPARC/Ppr.hs | 13 ++-- compiler/nativeGen/SPARC/ShortcutJump.hs | 23 ++++-- compiler/nativeGen/X86/CodeGen.hs | 17 ++--- compiler/nativeGen/X86/Instr.hs | 22 ++++-- compiler/nativeGen/X86/Ppr.hs | 10 ++- 46 files changed, 278 insertions(+), 280 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
