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

[Simon Peyton Jones]

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

On branch  : master

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

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

commit f13f9fca8444da225443aea190e8659b96954ae9
Merge: 735519b... da15d0c...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Jun 13 22:41:19 2011 +0100

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

 compiler/cmm/CmmCallConv.hs               |   29 +---
 compiler/cmm/CmmCvt.hs                    |    2 +-
 compiler/cmm/CmmDecl.hs                   |    4 +-
 compiler/cmm/CmmNode.hs                   |    8 +-
 compiler/cmm/CmmProcPoint.hs              |    2 +-
 compiler/cmm/CmmSpillReload.hs            |    4 +
 compiler/cmm/MkGraph.hs                   |   36 +++---
 compiler/cmm/OldCmm.hs                    |   14 +-
 compiler/cmm/OldCmmUtils.hs               |    4 +-
 compiler/cmm/PprC.hs                      |    4 +-
 compiler/cmm/cmm-notes                    |    4 -
 compiler/codeGen/CgForeignCall.hs         |    9 +-
 compiler/codeGen/CgInfoTbls.hs            |    4 +-
 compiler/codeGen/CgMonad.lhs              |    4 +-
 compiler/codeGen/CgPrimOp.hs              |   11 ++-
 compiler/codeGen/StgCmmForeign.hs         |   16 +-
 compiler/codeGen/StgCmmMonad.hs           |    4 +-
 compiler/codeGen/StgCmmPrim.hs            |  209 +++++++++++++++++++++++++++++
 compiler/codeGen/StgCmmUtils.hs           |   17 ++-
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs   |    4 +-
 compiler/nativeGen/PPC/CodeGen.hs         |    8 +-
 compiler/nativeGen/SPARC/CodeGen/CCall.hs |    6 +-
 compiler/nativeGen/X86/CodeGen.hs         |    8 +-
 23 files changed, 310 insertions(+), 101 deletions(-)