[commit: ghc] master: Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/ghc (01234ec)

[Richard Eisenberg]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

https://github.com/ghc/ghc/commit/01234ecfd712d12b9f295540e9389090bbda1384

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

commit 01234ecfd712d12b9f295540e9389090bbda1384
Merge: 6a25e92 fe44d05
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Fri Jun 28 09:35:51 2013 +0100

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

 compiler/ghc.cabal.in                   |    1 +
 compiler/llvmGen/Llvm.hs                |   11 +-
 compiler/llvmGen/Llvm/AbsSyn.hs         |   24 +-
 compiler/llvmGen/Llvm/MetaData.hs       |   84 +++
 compiler/llvmGen/Llvm/PpLlvm.hs         |  210 +++---
 compiler/llvmGen/Llvm/Types.hs          |  469 ++++++-------
 compiler/llvmGen/LlvmCodeGen.hs         |  252 ++++---
 compiler/llvmGen/LlvmCodeGen/Base.hs    |  402 ++++++++---
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 1128 ++++++++++++++++---------------
 compiler/llvmGen/LlvmCodeGen/Data.hs    |  155 ++---
 compiler/llvmGen/LlvmCodeGen/Ppr.hs     |   82 +--
 compiler/llvmGen/LlvmCodeGen/Regs.hs    |   55 +-
 compiler/main/CodeOutput.lhs            |    6 +-
 compiler/utils/Outputable.lhs           |    7 +
 14 files changed, 1565 insertions(+), 1321 deletions(-)