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

[Simon Peyton Jones]

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

On branch  : master

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

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

commit aaff876610bca45e1f00f310573d7eee6791f9b6
Merge: 05debbb... 09037d9...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Apr 24 08:06:08 2012 +0100

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

 compiler/cmm/CmmMachOp.hs               |    1 +
 compiler/cmm/PprC.hs                    |   11 ++--
 compiler/codeGen/CgPrimOp.hs            |   53 ++++++++++++++++++++
 compiler/ghc.mk                         |    2 -
 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 +++
 compiler/typecheck/FamInst.lhs          |   24 +++++----
 compiler/typecheck/Inst.lhs             |   33 +++++++------
 compiler/types/InstEnv.lhs              |    1 -
 ghc/InteractiveUI.hs                    |   12 +++--
 13 files changed, 184 insertions(+), 83 deletions(-)