[commit: ghc] master: Merge nb:ghc/git/ghc (09037d9)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/09037d92a4efa344f66d5dd031b45b17645b6382

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

commit 09037d92a4efa344f66d5dd031b45b17645b6382
Merge: e4de18d... 74b9eb7...
Author: Ian Lynagh <igloo at earth.li>
Date:   Mon Apr 23 16:11:46 2012 +0100

    Merge nb:ghc/git/ghc

 compiler/cmm/CmmMachOp.hs               |    1 +
 compiler/cmm/PprC.hs                    |   11 ++--
 compiler/codeGen/CgPrimOp.hs            |   53 ++++++++++++++++++++
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs |   13 +++--
 compiler/nativeGen/PPC/CodeGen.hs       |   13 +++--
 compiler/nativeGen/SPARC/CodeGen.hs     |   13 +++--
 compiler/nativeGen/X86/CodeGen.hs       |   83 +++++++++++++++++++++----------
 compiler/prelude/primops.txt.pp         |    8 +++
 8 files changed, 146 insertions(+), 49 deletions(-)