[commit: ghc] ghc-lwc2: Merge branch 'master' into ghc-lwc2 (ded08e4)

[Ian Lynagh]

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

On branch  : ghc-lwc2

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

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

commit ded08e4f985a25ae4fa23352601b0a31e52f983d
Merge: cabed55 cdae665
Author: KC Sivaramakrishnan <chandras at cs.purdue.edu>
Date:   Mon Feb 25 11:46:21 2013 -0500

    Merge branch 'master' into ghc-lwc2

 aclocal.m4                          | 10 ++++++----
 compiler/main/DynFlags.hs           | 15 ++++++++++++++-
 compiler/main/DynFlags.hs-boot      |  1 +
 compiler/nativeGen/X86/CodeGen.hs   | 20 ++++++++++++++------
 compiler/utils/Outputable.lhs       |  7 ++++++-
 docs/users_guide/extending_ghc.xml  | 11 ++++++-----
 driver/ghci/ghc.mk                  |  2 +-
 ghc/ghc.mk                          |  2 +-
 mk/config.mk.in                     |  3 +++
 mk/ways.mk                          |  2 +-
 rules/build-dependencies.mk         | 13 ++++++++++++-
 rules/build-package.mk              |  9 +++++++++
 rules/build-prog.mk                 |  2 ++
 rules/distdir-way-opts.mk           |  1 +
 rules/hi-rule.mk                    | 34 +++++++++++++++++++++-------------
 rules/hs-suffix-way-rules-srcdir.mk | 12 ++++++------
 rules/hs-suffix-way-rules.mk        | 25 +++++++++++++++++++------
 17 files changed, 123 insertions(+), 46 deletions(-)