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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/82f81d1272f2774d1d2b19aa620fa084f77d4bec

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

commit 82f81d1272f2774d1d2b19aa620fa084f77d4bec
Merge: deec5b7... 12f3a53...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Jan 14 16:46:40 2013 +0000

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

 compiler/main/DriverPhases.hs     |   61 +++++++++-------
 compiler/main/DriverPipeline.hs   |  149 +++++++++++++++++++++++-------------
 compiler/main/DynFlags.hs         |   60 ++++++++++++++-
 compiler/main/GhcMake.hs          |    4 +-
 compiler/main/HscMain.hs          |    3 +-
 compiler/nativeGen/SPARC/Base.hs  |   51 ++++++-------
 compiler/nativeGen/X86/CodeGen.hs |   12 +---
 compiler/prelude/PrelRules.lhs    |   24 +++---
 compiler/typecheck/TcForeign.lhs  |   18 +---
 compiler/typecheck/TcValidity.lhs |    8 ++-
 compiler/types/FunDeps.lhs        |   66 ++++++++++++++++-
 docs/users_guide/flags.xml        |    7 +-
 docs/users_guide/packages.xml     |    4 +-
 docs/users_guide/sooner.xml       |    2 +-
 ghc.mk                            |    4 -
 ghc/Main.hs                       |   10 +--
 libraries/bytestring              |    2 +-
 libraries/terminfo                |    2 +-
 mk/config.mk.in                   |    2 +
 rules/build-package-way.mk        |    2 -
 rules/build-package.mk            |    2 -
 rules/build-prog.mk               |    2 -
 rules/hi-rule.mk                  |   46 ++++++++++--
 rules/hs-suffix-rules-srcdir.mk   |    2 +
 rules/hs-suffix-rules.mk          |    6 ++
 25 files changed, 360 insertions(+), 189 deletions(-)