[commit: ghc] master: Merge remote branch 'phonohawk/patch-5408' (f26546b)

[Simon Marlow]

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

On branch  : master

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

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

commit f26546bbb339296d81272b0f8127119862a34b75
Merge: 606f6e1... 616b669...
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Fri Dec 9 10:33:45 2011 +0000

    Merge remote branch 'phonohawk/patch-5408'
    
    * phonohawk/patch-5408:
      Resurrect UseLibFFIForAdjustors from bitrot.
      Detect cases where as(1) doesn't recognise .ident directive (#5408)

 aclocal.m4                        |   11 +++++++++++
 compiler/ghc.mk                   |    2 +-
 compiler/main/SysTools.lhs        |    2 ++
 compiler/nativeGen/AsmCodeGen.lhs |   11 +++++++----
 compiler/utils/Platform.hs        |    1 +
 ghc.mk                            |    8 +++++---
 libffi/ghc.mk                     |    8 ++++----
 rts/ghc.mk                        |    9 ++++++++-
 rts/package.conf.in               |    2 +-
 settings.in                       |    1 +
 10 files changed, 41 insertions(+), 14 deletions(-)