[commit: ghc] master: Merge branch 'master' of https://github.com/ghc/ghc (5427df8)

[Johan Tibell]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/5427df8f466e62f154051f957f834f9e7837ea16

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

commit 5427df8f466e62f154051f957f834f9e7837ea16
Merge: bab8dc7... acb0cd9...
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Fri Jan 11 13:00:41 2013 -0800

    Merge branch 'master' of https://github.com/ghc/ghc

 compiler/main/DriverPhases.hs    |   61 ++++++++++--------
 compiler/main/DriverPipeline.hs  |  135 +++++++++++++++++++++++---------------
 compiler/main/DynFlags.hs        |   33 ++++++++-
 compiler/main/GhcMake.hs         |    4 +-
 compiler/nativeGen/SPARC/Base.hs |   51 ++++++--------
 compiler/typecheck/TcForeign.lhs |   18 ++----
 ghc/Main.hs                      |   10 +---
 libraries/bytestring             |    2 +-
 libraries/terminfo               |    2 +-
 mk/config.mk.in                  |    2 +
 rules/build-package-way.mk       |    2 -
 rules/build-prog.mk              |    2 -
 rules/hi-rule.mk                 |   21 ++++--
 rules/hs-suffix-rules.mk         |    3 +
 14 files changed, 196 insertions(+), 150 deletions(-)