[commit: ghc] newcg: Fix merge-related problems (3f0afab)

[Simon Marlow]

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

On branch  : newcg

http://hackage.haskell.org/trac/ghc/changeset/3f0afabaf3e862d986279dc041b14b61e73f86d3

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

commit 3f0afabaf3e862d986279dc041b14b61e73f86d3
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Wed Jul 4 13:19:26 2012 +0100

    Fix merge-related problems

 compiler/cmm/CmmBuildInfoTables.hs |   12 ++----------
 compiler/cmm/CmmLayoutStack.hs     |    5 ++++-
 compiler/cmm/CmmLint.hs            |   24 ++++++++++++------------
 compiler/cmm/CmmOpt.hs             |    6 +++---
 compiler/cmm/CmmPipeline.hs        |   24 +++++++-----------------
 compiler/codeGen/CodeGen.lhs       |    3 ++-
 compiler/codeGen/StgCmmHeap.hs     |    2 +-
 compiler/codeGen/StgCmmUtils.hs    |    4 ++--
 compiler/main/CodeOutput.lhs       |    2 --
 compiler/main/HscMain.hs           |    2 --
 compiler/nativeGen/AsmCodeGen.lhs  |    2 +-
 compiler/utils/Outputable.lhs      |    2 --
 12 files changed, 34 insertions(+), 54 deletions(-)


Diff suppressed because of size. To see it, use:

    git show 3f0afabaf3e862d986279dc041b14b61e73f86d3