[commit: ghc] local-gc: Merge commit '521b792553bacbdb0eec138b150ab0626ea6f36b' into local-gc (f0e9125)

[Simon Marlow]

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

On branch  : local-gc

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

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

commit f0e9125a76ac274951a848806e02905ddbf96f49
Merge: c937dc7... 521b792...
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Sun Jun 5 13:59:02 2011 +0100

    Merge commit '521b792553bacbdb0eec138b150ab0626ea6f36b' into local-gc

 compiler/main/Finder.lhs        |  204 +++++++++++++++++++--------------------
 compiler/prelude/primops.txt.pp |    6 +
 includes/stg/MiscClosures.h     |    1 +
 includes/stg/SMP.h              |    3 +-
 rts/Linker.c                    |    1 +
 rts/PrimOps.cmm                 |   19 ++++
 sync-all                        |    4 +
 7 files changed, 134 insertions(+), 104 deletions(-)