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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/95724776ea3da00339e7171e85f8b42cd7228f43

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

commit 95724776ea3da00339e7171e85f8b42cd7228f43
Merge: 30cf978... 3c1fd68...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Feb 14 14:39:14 2013 +0000

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

 README                                   |  104 -----
 README.md                                |  100 +++++
 aclocal.m4                               |   51 ++-
 compiler/coreSyn/CoreUtils.lhs           |    6 +-
 compiler/coreSyn/PprCore.lhs             |   29 +-
 compiler/deSugar/Check.lhs               |    5 +-
 compiler/deSugar/Match.lhs               |   42 ++-
 compiler/iface/TcIface.lhs               |    5 +-
 compiler/parser/Parser.y.pp              |    2 +-
 compiler/prelude/PrelNames.lhs           |    5 +-
 compiler/stranal/WwLib.lhs               |    2 +-
 compiler/typecheck/TcErrors.lhs          |    2 +-
 compiler/typecheck/TcGenDeriv.lhs        |  117 +++---
 compiler/typecheck/TcGenGenerics.lhs     |    7 +-
 compiler/typecheck/TcRnDriver.lhs        |    3 +-
 compiler/typecheck/TcSimplify.lhs        |    2 +-
 compiler/typecheck/TcUnify.lhs           |    2 +-
 compiler/types/Coercion.lhs              |    5 +-
 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                             |  624 ++++++++++++++++--------------
 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/GCAux.c                           |    8 +
 rts/sm/GCThread.h                        |    1 -
 rts/sm/Storage.c                         |   30 +--
 rts/sm/Storage.h                         |    4 +-
 utils/deriveConstants/DeriveConstants.hs |    3 +
 43 files changed, 775 insertions(+), 631 deletions(-)