Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/6ed586542afab8b18bcb45ac649a89e13e258643 >--------------------------------------------------------------- commit 6ed586542afab8b18bcb45ac649a89e13e258643 Merge: 2395cdf... 8023014... Author: Simon Peyton Jones <[email protected]> Date: Mon Jun 27 09:15:03 2011 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc aclocal.m4 | 7 ++- boot | 1 + compiler/cmm/PprC.hs | 106 +++++++++++++++++++++------------------ compiler/ghc.mk | 4 -- compiler/llvmGen/LlvmMangler.hs | 17 +++--- compiler/main/DynFlags.hs | 3 - ghc.mk | 37 ++++++------- ghc/ghc.mk | 1 + mk/config.mk.in | 1 + mk/validate-settings.mk | 9 +++ rts/Interpreter.c | 20 ++++++-- rts/Linker.c | 17 +++++-- rts/Printer.c | 4 -- rts/ProfHeap.c | 18 +++--- rts/Profiling.h | 7 +++ rts/STM.c | 4 +- rts/Schedule.c | 10 +++- rts/Task.c | 4 +- rts/Trace.h | 9 ++-- rts/sm/GC.c | 13 ++++- rts/sm/GCUtils.c | 7 +-- rts/sm/Sanity.c | 4 -- rules/build-package.mk | 2 + sync-all | 12 +++-- utils/ghc-cabal/ghc.mk | 10 ++-- utils/ghc-pkg/ghc.mk | 2 +- utils/lndir/lndir.c | 2 + validate | 2 +- 28 files changed, 195 insertions(+), 138 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
