Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/f0c760ce548a2f2889abfe6a1a726994a418e675 >--------------------------------------------------------------- commit f0c760ce548a2f2889abfe6a1a726994a418e675 Merge: 8c2aa49... 4a0eb92... Author: Simon Peyton Jones <[email protected]> Date: Tue Jan 10 14:11:53 2012 +0000 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/cmm/CmmCvt.hs | 4 +- compiler/cmm/CmmLint.hs | 2 +- compiler/cmm/CmmOpt.hs | 6 +- compiler/cmm/CmmParse.y | 8 +- compiler/cmm/OldCmm.hs | 54 ++++++++----- compiler/cmm/OldPprCmm.hs | 28 +++---- compiler/cmm/PprC.hs | 4 +- compiler/codeGen/CgClosure.lhs | 10 ++- compiler/codeGen/CgCon.lhs | 13 ++- compiler/codeGen/CgExpr.lhs | 8 +- compiler/codeGen/CgHeapery.lhs | 90 ++++++++++++--------- compiler/codeGen/CgInfoTbls.hs | 8 +- compiler/codeGen/CgMonad.lhs | 2 +- compiler/codeGen/CgTailCall.lhs | 88 +++++++++++--------- compiler/codeGen/CgUtils.hs | 2 +- compiler/ghci/ObjLink.lhs | 38 +++------ compiler/llvmGen/Llvm/PpLlvm.hs | 48 ++++++++---- compiler/llvmGen/LlvmCodeGen.hs | 1 + compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 32 +++++-- compiler/llvmGen/LlvmCodeGen/Regs.hs | 8 ++- compiler/nativeGen/AsmCodeGen.lhs | 4 +- compiler/nativeGen/PPC/CodeGen.hs | 2 +- compiler/nativeGen/SPARC/CodeGen.hs | 2 +- compiler/nativeGen/X86/CodeGen.hs | 2 +- includes/rts/Linker.h | 18 +++-- includes/rts/storage/GC.h | 8 +- rts/Capability.c | 2 +- rts/Linker.c | 136 +++++++++++++++++++------------ rts/LinkerInternals.h | 2 +- rts/Updates.cmm | 11 ++- sync-all | 2 +- 31 files changed, 374 insertions(+), 269 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
