Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/0f085f36f89d5942ce39ca5389a289d9e112d7c1 >--------------------------------------------------------------- commit 0f085f36f89d5942ce39ca5389a289d9e112d7c1 Merge: f450d36... 3284117... Author: Simon Peyton Jones <[email protected]> Date: Thu Jun 21 08:48:56 2012 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/cmm/CmmOpt.hs | 6 +- compiler/cmm/OldPprCmm.hs | 61 +++++++++---------- compiler/cmm/PprCmmDecl.hs | 33 ++++------ compiler/cmm/PprCmmExpr.hs | 99 ++++++++++++++----------------- compiler/codeGen/CgParallel.hs | 59 ++++++++---------- compiler/codeGen/ClosureInfo.lhs | 4 +- compiler/codeGen/StgCmmClosure.hs | 4 +- compiler/codeGen/StgCmmGran.hs | 41 +++++-------- compiler/llvmGen/LlvmCodeGen.hs | 2 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 6 +- compiler/main/DynFlags.hs | 4 + compiler/main/StaticFlagParser.hs | 13 +---- compiler/main/StaticFlags.hs | 8 --- compiler/nativeGen/AsmCodeGen.lhs | 5 +- compiler/nativeGen/PPC/CodeGen.hs | 5 +- docs/users_guide/flags.xml | 6 -- docs/users_guide/ghci.xml | 11 ---- includes/Cmm.h | 6 ++ 18 files changed, 156 insertions(+), 217 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
