Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branches: ghc-new-flavor,master
http://hackage.haskell.org/trac/ghc/changeset/1a4ae306f9e87aea921522276e0ef26ec01f97b4 >--------------------------------------------------------------- commit 1a4ae306f9e87aea921522276e0ef26ec01f97b4 Merge: 022c1d2... 7f61ae2... Author: Dimitrios.Vytiniotis <[email protected]> Date: Thu Apr 5 09:03:31 2012 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-new-flavor compiler/deSugar/Desugar.lhs | 3 + compiler/iface/MkIface.lhs | 43 +++---- compiler/main/DynFlags.hs | 29 +++-- compiler/main/ErrUtils.lhs | 5 +- compiler/main/GHC.hs | 50 ++++++--- compiler/main/HscMain.hs | 155 +++++++++++++---------- compiler/main/HscTypes.lhs | 17 +-- compiler/typecheck/TcRnDriver.lhs | 26 ++-- compiler/typecheck/TcRnMonad.lhs | 9 ++ includes/rts/EventLogFormat.h | 27 ++++- includes/rts/storage/GC.h | 4 +- rts/Capability.c | 22 ++-- rts/Capability.h | 2 + rts/RtsFlags.c | 2 +- rts/RtsProbes.d | 36 ++++-- rts/Schedule.c | 7 +- rts/Stats.c | 97 ++++++++++++--- rts/Stats.h | 8 +- rts/Trace.c | 98 ++++++++++++++- rts/Trace.h | 245 +++++++++++++++++++++++++++++++++--- rts/eventlog/EventLog.c | 196 ++++++++++++++++++++++++++++-- rts/eventlog/EventLog.h | 34 +++++ rts/sm/GC.c | 25 ++-- rts/sm/Storage.c | 58 ++++++---- rts/sm/Storage.h | 3 +- 25 files changed, 932 insertions(+), 269 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
