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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/c6f4f8ac1d5867ae23504f2242f0035c90db84a9

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

commit c6f4f8ac1d5867ae23504f2242f0035c90db84a9
Merge: 0001f51... 6fbd46b...
Author: Ian Lynagh <[email protected]>
Date:   Fri Oct 19 13:18:46 2012 +0100

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

 compiler/cmm/CmmParse.y                 |    2 +-
 compiler/cmm/OldCmm.hs                  |    5 +-
 compiler/cmm/SMRep.lhs                  |    3 -
 compiler/codeGen/CgBindery.lhs          |  564 ---------------
 compiler/codeGen/CgBindery.lhs-boot     |   11 -
 compiler/codeGen/CgCallConv.hs          |  414 -----------
 compiler/codeGen/CgCase.lhs             |  673 ------------------
 compiler/codeGen/CgClosure.lhs          |  641 -----------------
 compiler/codeGen/CgCon.lhs              |  490 -------------
 compiler/codeGen/CgExpr.lhs             |  496 -------------
 compiler/codeGen/CgExpr.lhs-boot        |    7 -
 compiler/codeGen/CgForeignCall.hs       |  322 ---------
 compiler/codeGen/CgHeapery.lhs          |  642 -----------------
 compiler/codeGen/CgHpc.hs               |   40 -
 compiler/codeGen/CgInfoTbls.hs          |  374 ----------
 compiler/codeGen/CgLetNoEscape.lhs      |  215 ------
 compiler/codeGen/CgMonad.lhs            |  849 ----------------------
 compiler/codeGen/CgParallel.hs          |  100 ---
 compiler/codeGen/CgPrimOp.hs            | 1177 -------------------------------
 compiler/codeGen/CgProf.hs              |  310 --------
 compiler/codeGen/CgStackery.lhs         |  371 ----------
 compiler/codeGen/CgTailCall.lhs         |  509 -------------
 compiler/codeGen/CgTicky.hs             |  397 -----------
 compiler/codeGen/CgUtils.hs             |  756 +--------------------
 compiler/codeGen/ClosureInfo.lhs        | 1122 -----------------------------
 compiler/codeGen/ClosureInfo.lhs-boot   |    6 -
 compiler/codeGen/StgCmmGran.hs          |    2 +-
 compiler/codeGen/StgCmmLayout.hs        |   20 +-
 compiler/ghc.cabal.in                   |   22 +-
 compiler/ghci/ByteCodeAsm.lhs           |   32 +-
 compiler/ghci/ByteCodeGen.lhs           |  129 ++--
 compiler/ghci/ByteCodeInstr.lhs         |    6 +-
 compiler/ghci/ByteCodeItbls.lhs         |    7 +-
 compiler/ghci/DebuggerUtils.hs          |    2 +-
 compiler/llvmGen/LlvmCodeGen/Base.hs    |    2 +-
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs |    2 +-
 includes/Cmm.h                          |   14 +-
 rts/Exception.cmm                       |    8 +-
 rts/HeapStackCheck.cmm                  |    2 +-
 rts/PrimOps.cmm                         |   42 +-
 rts/StgStartup.cmm                      |    2 +-
 rts/StgStdThunks.cmm                    |   18 +-
 rts/Updates.cmm                         |    8 +-
 rts/Updates.h                           |    4 +-
 44 files changed, 164 insertions(+), 10654 deletions(-)



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

Reply via email to