[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc (d31036e)

[Simon Peyton Jones]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/d31036ef094f18f8193c7a3de5dfe3c7db804853

>---------------------------------------------------------------

commit d31036ef094f18f8193c7a3de5dfe3c7db804853
Merge: 6518ebe... 88b4578...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Feb 14 13:05:08 2013 +0000

    Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc

 aclocal.m4                               |   49 ++-
 compiler/typecheck/TcErrors.lhs          |    2 +-
 compiler/typecheck/TcSimplify.lhs        |    2 +-
 configure.ac                             |   11 +-
 includes/HsFFI.h                         |    4 +
 includes/rts/Stable.h                    |   15 +-
 includes/rts/storage/GC.h                |    2 +-
 includes/stg/MiscClosures.h              |    2 +-
 mk/config.mk.in                          |    4 +-
 rts/Hash.c                               |    5 +
 rts/Hash.h                               |    3 +-
 rts/HsFFI.c                              |   18 +
 rts/Linker.c                             |    4 +
 rts/PrimOps.cmm                          |   20 +-
 rts/RetainerProfile.c                    |    2 +-
 rts/RtsStartup.c                         |    4 +-
 rts/Stable.c                             |  576 ++++++++++++++++--------------
 rts/Stable.h                             |   29 +-
 rts/Stats.c                              |   71 +++--
 rts/Stats.h                              |    4 +-
 rts/ghc.mk                               |    2 +-
 rts/sm/Compact.c                         |    2 +-
 rts/sm/GC.c                              |   45 +--
 rts/sm/GCThread.h                        |    1 -
 rts/sm/Storage.c                         |   30 +--
 rts/sm/Storage.h                         |    4 +-
 utils/deriveConstants/DeriveConstants.hs |    3 +
 27 files changed, 512 insertions(+), 402 deletions(-)