[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc (4ee5e3b)
Simon Peyton Jones <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master http://hackage.haskell.org/trac/ghc/changeset/4ee5e3b2469c2919b33854ad5cdbbce895733db5 >--------------------------------------------------------------- commit 4ee5e3b2469c2919b33854ad5cdbbce895733db5 Merge: 1437590... 6d784c4... Author: Simon Peyton Jones <[email protected]> Date: Fri Nov 16 12:52:12 2012 +0000 Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc compiler/coreSyn/CoreSyn.lhs | 2 +- compiler/typecheck/TcInstDcls.lhs | 8 ++-- includes/rts/storage/ClosureTypes.h | 37 +++++++++--------- includes/stg/MiscClosures.h | 3 +- rts/ClosureFlags.c | 5 +- rts/Exception.cmm | 2 +- rts/LdvProfile.c | 1 + rts/Linker.c | 3 + rts/PrimOps.cmm | 2 +- rts/Printer.c | 14 +++++++ rts/ProfHeap.c | 3 +- rts/RetainerProfile.c | 5 ++- rts/STM.c | 63 ++++++++++++++++++------------ rts/STM.h | 2 +- rts/Schedule.c | 2 +- rts/StgMiscClosures.cmm | 7 ++- rts/sm/Compact.c | 1 + rts/sm/Evac.c | 12 ++--- rts/sm/GC.c | 22 +++++++++- rts/sm/GC.h | 8 +++- rts/sm/Sanity.c | 3 +- rts/sm/Scav.c | 73 +++++++++++++++++++++++++++++++++-- rts/sm/Storage.c | 9 ++++ rts/sm/Storage.h | 3 +- 24 files changed, 215 insertions(+), 75 deletions(-)