[commit: ghc] master: Merge commit '3cedbfb49996da2f029b4a84ca39f4d21f309813' (8a6e330)

[Simon Marlow]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/8a6e330ac9c2dde11b0641dce69bb809af6a494c

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

commit 8a6e330ac9c2dde11b0641dce69bb809af6a494c
Merge: ca5d15a... 3cedbfb...
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Mon Feb 4 11:19:33 2013 +0000

    Merge commit '3cedbfb49996da2f029b4a84ca39f4d21f309813'
    
    * commit '3cedbfb49996da2f029b4a84ca39f4d21f309813':
      AsmCodeGen.NcgImpl.ncgMakeFarBranches should take account of info tables (#709)
      Move AsmCodeGen.makeFarBranches to PPC.Instr (#709)

 compiler/nativeGen/AsmCodeGen.lhs |   47 ++++---------------------------------
 compiler/nativeGen/PPC/Instr.hs   |   42 ++++++++++++++++++++++++++++++++-
 2 files changed, 46 insertions(+), 43 deletions(-)