Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/4fbe2780973f33bc1dbe4f75139e278965ac31e1 >--------------------------------------------------------------- commit 4fbe2780973f33bc1dbe4f75139e278965ac31e1 Merge: ce8ae48... 37a6a52... Author: Simon Peyton Jones <[email protected]> Date: Mon May 9 12:01:38 2011 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/basicTypes/Module.lhs | 6 +- compiler/cmm/PprC.hs | 15 - compiler/ghc.mk | 90 ------ compiler/ghci/ByteCodeAsm.lhs | 29 +- compiler/ghci/ByteCodeGen.lhs | 488 ++++++++++++++--------------- compiler/main/CmdLineParser.hs | 2 +- compiler/main/DriverPipeline.hs | 22 +- compiler/main/DynFlags.hs | 39 +-- compiler/main/ErrUtils.lhs | 3 +- compiler/nativeGen/AsmCodeGen.lhs | 17 +- compiler/nativeGen/PPC/Ppr.hs | 4 - compiler/nativeGen/SPARC/Ppr.hs | 7 - compiler/nativeGen/X86/Ppr.hs | 9 - compiler/typecheck/TcRnMonad.lhs | 4 +- compiler/utils/Outputable.lhs | 281 +++++++++++------ compiler/{nativeGen => utils}/Platform.hs | 0 compiler/utils/Pretty.lhs | 7 +- configure.ac | 2 - ghc/InteractiveUI.hs | 2 +- rts/ProfHeap.c | 2 +- rts/RetainerSet.c | 75 ++--- rts/RetainerSet.h | 2 +- rules/build-package-way.mk | 8 +- 23 files changed, 531 insertions(+), 583 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
