Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/4b73bcc1e8e5e6bc762c3f429d88de133b02c2a4 >--------------------------------------------------------------- commit 4b73bcc1e8e5e6bc762c3f429d88de133b02c2a4 Merge: e01036f... 24c0c8c... Author: Simon Peyton Jones <[email protected]> Date: Wed May 4 11:37:02 2011 +0100 Merge remote branch 'origin/master' into monad-comp MAKEHELP | 6 - aclocal.m4 | 19 +- compiler/cmm/CLabel.hs | 29 +- compiler/cmm/CmmOpt.hs | 61 +++ compiler/cmm/PprC.hs | 2 +- compiler/ghc.cabal.in | 17 +- compiler/ghc.mk | 60 +++- compiler/ghci/ByteCodeAsm.lhs | 5 +- compiler/llvmGen/LlvmMangler.hs | 10 +- compiler/main/CodeOutput.lhs | 22 +- compiler/main/DriverPipeline.hs | 133 +++---- compiler/main/DynFlags.hs | 129 +++--- compiler/main/SysTools.lhs | 19 +- compiler/nativeGen/Alpha/CodeGen.hs | 789 ----------------------------------- compiler/nativeGen/Alpha/Instr.hs | 142 ------- compiler/nativeGen/Alpha/Ppr.hs-old | 562 ------------------------- compiler/nativeGen/Alpha/RegInfo.hs | 218 ---------- compiler/nativeGen/Alpha/Regs.hs | 323 -------------- compiler/nativeGen/AsmCodeGen.lhs | 15 +- compiler/nativeGen/PPC/Regs.hs | 1 - compiler/nativeGen/Platform.hs | 7 +- compiler/nativeGen/X86/CodeGen.hs | 2 +- compiler/nativeGen/X86/Regs.hs | 1 - compiler/prelude/primops.txt.pp | 14 +- configure.ac | 4 + ghc/ghc.wrapper | 2 +- includes/stg/SMP.h | 2 + mk/config.mk.in | 11 +- rules/build-package-data.mk | 7 +- rules/c-suffix-rules.mk | 2 +- rules/package-config.mk | 1 + rules/shell-wrapper.mk | 1 - settings.in | 4 + 33 files changed, 334 insertions(+), 2286 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
