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

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/9911ec5554b4b0a9492cdf5fd80e3239c448ec2b

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

commit 9911ec5554b4b0a9492cdf5fd80e3239c448ec2b
Merge: 1a8c2bb... 9a0adc0...
Author: Ian Lynagh <igloo at earth.li>
Date:   Sun Dec 4 15:34:59 2011 +0000

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

 compiler/cmm/PprC.hs                    |    3 --
 compiler/codeGen/CgInfoTbls.hs          |   24 +----------------
 compiler/llvmGen/LlvmCodeGen.hs         |   39 ++++++++++++++++++---------
 compiler/llvmGen/LlvmCodeGen/Base.hs    |   28 ++++++++++++-------
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs |   14 ++++-----
 compiler/llvmGen/LlvmCodeGen/Data.hs    |   45 +++++++++++++------------------
 compiler/llvmGen/LlvmMangler.hs         |    2 +-
 compiler/main/CodeOutput.lhs            |    4 ++-
 8 files changed, 74 insertions(+), 85 deletions(-)