[commit: ghc] local-gc: Merge commit '4f018b471c7c5db858beb508b8430ae4d0621173' into local-gc (13ac015)

[Simon Marlow]

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

On branch  : local-gc

http://hackage.haskell.org/trac/ghc/changeset/13ac0151f7ac9a90fa026f89699b1206207fcfcd

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

commit 13ac0151f7ac9a90fa026f89699b1206207fcfcd
Merge: e684cb6... 4f018b4...
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Sun Jun 5 14:33:25 2011 +0100

    Merge commit '4f018b471c7c5db858beb508b8430ae4d0621173' into local-gc

 compiler/cmm/CmmLive.hs        |    4 ++--
 compiler/cmm/CmmNode.hs        |    2 ++
 compiler/cmm/CmmSpillReload.hs |   10 +++++-----
 compiler/codeGen/CgClosure.lhs |    1 -
 compiler/ghc.mk                |   12 ++++++++++++
 compiler/main/DynFlags.hs      |    4 ++++
 compiler/utils/UniqFM.lhs      |    4 +++-
 mk/config.mk.in                |   10 ++++++++++
 rts/sm/GCAux.c                 |    2 +-
 9 files changed, 39 insertions(+), 10 deletions(-)