Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/429c81c5ae861afd0e6910b7c0d331e65e8d4022 >--------------------------------------------------------------- commit 429c81c5ae861afd0e6910b7c0d331e65e8d4022 Merge: 8e189a7... 6c54727... Author: Simon Peyton Jones <simo...@microsoft.com> Date: Fri Oct 19 20:35:19 2012 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/basicTypes/Name.lhs | 6 +- compiler/basicTypes/OccName.lhs | 2 +- compiler/basicTypes/Var.lhs | 2 +- compiler/cmm/CLabel.hs | 8 +- compiler/cmm/CmmInfo.hs | 2 +- compiler/cmm/CmmParse.y | 4 +- compiler/cmm/CmmPipeline.hs | 8 +- compiler/cmm/OldCmm.hs | 5 +- compiler/cmm/PprC.hs | 2 +- compiler/cmm/SMRep.lhs | 5 +- 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/StgCmm.hs | 2 +- compiler/codeGen/StgCmmBind.hs | 10 +- compiler/codeGen/StgCmmClosure.hs | 10 +- compiler/codeGen/StgCmmCon.hs | 4 +- compiler/codeGen/StgCmmForeign.hs | 4 +- compiler/codeGen/StgCmmGran.hs | 2 +- compiler/codeGen/StgCmmHeap.hs | 2 +- compiler/codeGen/StgCmmHpc.hs | 2 +- compiler/codeGen/StgCmmLayout.hs | 24 +- compiler/codeGen/StgCmmPrim.hs | 2 +- compiler/codeGen/StgCmmProf.hs | 10 +- compiler/codeGen/StgCmmTicky.hs | 2 +- compiler/coreSyn/CoreArity.lhs | 6 +- compiler/coreSyn/CoreSubst.lhs | 2 +- compiler/coreSyn/MkExternalCore.lhs | 2 +- compiler/coreSyn/PprCore.lhs | 14 +- compiler/deSugar/Coverage.lhs | 14 +- compiler/deSugar/Desugar.lhs | 8 +- compiler/deSugar/DsExpr.lhs | 6 +- compiler/deSugar/DsListComp.lhs | 2 +- compiler/deSugar/DsMonad.lhs | 4 +- compiler/deSugar/Match.lhs | 3 +- 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/Debugger.hs | 8 +- compiler/ghci/DebuggerUtils.hs | 2 +- compiler/ghci/Linker.lhs | 68 ++- compiler/iface/FlagChecker.hs | 2 +- compiler/iface/LoadIface.lhs | 2 +- compiler/iface/MkIface.lhs | 2 +- compiler/iface/TcIface.lhs | 4 +- compiler/llvmGen/LlvmCodeGen/Base.hs | 2 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 4 +- compiler/main/CodeOutput.lhs | 2 +- compiler/main/DriverPipeline.hs | 231 +----- compiler/main/DynFlags.hs | 356 +++++---- compiler/main/ErrUtils.lhs | 61 +- compiler/main/Finder.lhs | 2 +- compiler/main/GHC.hs | 2 +- compiler/main/GhcMake.hs | 12 +- compiler/main/HeaderInfo.hs | 2 +- compiler/main/HscMain.hs | 4 +- compiler/main/HscTypes.lhs | 11 +- compiler/main/InteractiveEval.hs | 8 +- compiler/main/Packages.lhs | 14 +- compiler/main/SysTools.lhs | 178 ++++- compiler/main/TidyPgm.lhs | 4 +- compiler/nativeGen/AsmCodeGen.lhs | 12 +- compiler/nativeGen/PIC.hs | 477 ++++++------ compiler/nativeGen/PPC/CodeGen.hs | 4 +- compiler/nativeGen/RegAlloc/Graph/Main.hs | 6 +- compiler/nativeGen/SPARC/CodeGen.hs | 2 +- compiler/nativeGen/X86/CodeGen.hs | 8 +- compiler/parser/Lexer.x | 10 +- compiler/prelude/PrelRules.lhs | 4 +- compiler/prelude/primops.txt.pp | 11 + compiler/profiling/ProfInit.hs | 2 +- compiler/profiling/SCCfinal.lhs | 4 +- compiler/rename/RnBinds.lhs | 2 +- compiler/rename/RnEnv.lhs | 10 +- compiler/rename/RnExpr.lhs | 2 +- compiler/rename/RnNames.lhs | 14 +- compiler/rename/RnTypes.lhs | 2 +- compiler/simplCore/CoreMonad.lhs | 16 +- compiler/simplCore/FloatOut.lhs | 2 +- compiler/simplCore/SimplCore.lhs | 24 +- compiler/simplCore/SimplUtils.lhs | 10 +- compiler/simplCore/Simplify.lhs | 2 +- compiler/simplStg/SimplStg.lhs | 105 ++-- compiler/stgSyn/StgSyn.lhs | 2 +- compiler/typecheck/TcBinds.lhs | 2 +- compiler/typecheck/TcErrors.lhs | 2 +- compiler/typecheck/TcPat.lhs | 2 +- compiler/typecheck/TcRnDriver.lhs | 6 +- compiler/typecheck/TcRnMonad.lhs | 47 +- compiler/typecheck/TcSMonad.lhs | 2 +- compiler/typecheck/TcSplice.lhs | 2 +- compiler/typecheck/TcTyClsDecls.lhs | 4 +- compiler/typecheck/TcUnify.lhs | 2 +- compiler/vectorise/Vectorise/Exp.hs | 4 +- compiler/vectorise/Vectorise/Monad/Base.hs | 2 +- ghc.mk | 5 + ghc/InteractiveUI.hs | 20 +- ghc/Main.hs | 4 +- includes/Cmm.h | 14 +- includes/rts/EventLogFormat.h | 6 +- includes/stg/MiscClosures.h | 1 + mk/build.mk.sample | 1 + mk/config.mk.in | 3 +- rts/Exception.cmm | 8 +- rts/HeapStackCheck.cmm | 2 +- rts/Linker.c | 71 ++- rts/PrimOps.cmm | 67 ++- rts/RtsProbes.d | 1 + rts/StgStartup.cmm | 2 +- rts/StgStdThunks.cmm | 18 +- rts/Trace.c | 27 + rts/Trace.h | 10 + rts/Updates.cmm | 8 +- rts/Updates.h | 4 +- rts/eventlog/EventLog.c | 23 + rts/eventlog/EventLog.h | 2 + rts/ghc.mk | 11 +- rts/posix/Itimer.c | 3 + rules/build-package-data.mk | 5 +- rules/build-package-way.mk | 12 +- rules/build-package.mk | 4 + rules/build-prog.mk | 17 +- rules/shell-wrapper.mk | 4 + utils/ghc-cabal/Main.hs | 7 +- utils/ghctags/Main.hs | 2 +- utils/ghctags/ghc.mk | 6 +- utils/ghctags/ghctags.cabal | 22 + utils/hpc/ghc.mk | 6 +- utils/hpc/hpc-bin.cabal | 11 +- 151 files changed, 1429 insertions(+), 11626 deletions(-) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
