Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/8c2aa498b7798f176a0a23f6b501806b8712d8a5 >--------------------------------------------------------------- commit 8c2aa498b7798f176a0a23f6b501806b8712d8a5 Merge: a0f8b3a... 9e45287... Author: Simon Peyton Jones <[email protected]> Date: Mon Jan 9 14:07:03 2012 +0000 Merge branch 'master' of http://darcs.haskell.org/ghc aclocal.m4 | 3 +- compiler/cmm/CmmCvt.hs | 2 +- compiler/cmm/CmmLint.hs | 6 +- compiler/cmm/CmmOpt.hs | 8 +- compiler/cmm/CmmParse.y | 11 +- compiler/cmm/OldCmm.hs | 163 ++++---- compiler/cmm/OldPprCmm.hs | 19 +- compiler/cmm/PprC.hs | 8 +- compiler/codeGen/CgBindery.lhs | 383 ++++++++--------- compiler/codeGen/CgCallConv.hs | 223 +++++----- compiler/codeGen/CgCase.lhs | 526 +++++++++++----------- compiler/codeGen/CgClosure.lhs | 4 +- compiler/codeGen/CgCon.lhs | 4 +- compiler/codeGen/CgForeignCall.hs | 20 +- compiler/codeGen/CgHeapery.lhs | 2 +- compiler/codeGen/CgInfoTbls.hs | 2 +- compiler/codeGen/CgMonad.lhs | 726 +++++++++++++++---------------- compiler/codeGen/CgPrimOp.hs | 175 ++++---- compiler/codeGen/CgTailCall.lhs | 10 +- compiler/codeGen/CgUtils.hs | 2 +- compiler/codeGen/ClosureInfo.lhs | 5 +- compiler/codeGen/StgCmmForeign.hs | 2 +- compiler/ghc.mk | 2 +- compiler/ghci/RtClosureInspect.hs | 2 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 4 +- compiler/nativeGen/AsmCodeGen.lhs | 4 +- compiler/nativeGen/PPC/CodeGen.hs | 4 +- compiler/nativeGen/SPARC/CodeGen.hs | 4 +- compiler/nativeGen/X86/CodeGen.hs | 13 +- compiler/prelude/PrelNames.lhs | 23 +- compiler/prelude/PrelRules.lhs | 21 +- compiler/stgSyn/StgSyn.lhs | 591 ++++++++++++------------- configure.ac | 20 +- docs/users_guide/using.xml | 2 +- ghc.mk | 22 +- includes/ghc.mk | 8 +- includes/mkDerivedConstants.c | 26 +- includes/rts/Threads.h | 4 - includes/rts/prof/CCS.h | 16 +- includes/rts/storage/TSO.h | 2 +- includes/stg/Regs.h | 4 +- libraries/gen_contents_index | 21 +- mk/config.mk.in | 11 +- mk/tree.mk | 2 +- rts/PrimOps.cmm | 2 +- rts/RaiseAsync.c | 4 +- rts/Schedule.c | 12 +- rts/Stats.c | 22 +- rts/StgCRun.c | 2 +- rts/Threads.c | 2 +- rts/ghc.mk | 4 +- rts/package.conf.in | 2 +- rules/hs-suffix-rules-srcdir.mk | 4 +- rules/manual-package-config.mk | 4 +- utils/genapply/ghc.mk | 6 +- utils/hp2ps/ghc.mk | 2 +- 56 files changed, 1568 insertions(+), 1608 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
