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

[Simon Peyton Jones]

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

On branch  : master

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

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

commit df2e8675ae1c1d336f290679c206cf0165493266
Merge: c3ad38d 2fb8da2
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Mar 4 09:42:36 2013 +0000

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

 HACKING                             |  63 ------
 HACKING.md                          | 149 +++++++++++++
 README.md                           |  67 ++++--
 aclocal.m4                          |   6 +-
 bindisttest/ghc.mk                  |   2 +-
 boot                                |   5 +-
 compiler/ghc.mk                     |  68 +++---
 compiler/ghci/Linker.lhs            |  31 ++-
 compiler/hsSyn/HsExpr.lhs           |   4 +-
 compiler/llvmGen/LlvmCodeGen/Ppr.hs |   3 +
 compiler/main/CodeOutput.lhs        |   7 +-
 compiler/main/DriverPipeline.hs     | 188 +++++++++--------
 compiler/main/DynFlags.hs           |   6 +-
 compiler/main/HscMain.hs            |  28 +--
 compiler/simplCore/CoreMonad.lhs    |   4 +-
 compiler/typecheck/TcCanonical.lhs  | 150 +++++++-------
 compiler/typecheck/TcInteract.lhs   |   1 +
 compiler/typecheck/TcRnTypes.lhs    |  33 ++-
 compiler/typecheck/TcSMonad.lhs     |   5 +-
 compiler/types/Kind.lhs             |   9 +-
 compiler/utils/Platform.hs          |  13 +-
 configure.ac                        |  12 --
 driver/ghc/ghc.mk                   |   4 +-
 driver/ghci/ghc.mk                  |   8 +-
 driver/haddock/ghc.mk               |   4 +-
 driver/split/ghc.mk                 |   5 +-
 ghc.mk                              | 402 ++++++++++++++++--------------------
 ghc/ghc.mk                          |  24 +--
 includes/rts/prof/CCS.h             |   2 +-
 mk/config.mk.in                     | 112 ++--------
 mk/project.mk.in                    |  13 +-
 mk/tree.mk                          |  19 --
 rts/ProfHeap.c                      |   2 +-
 rts/StgCRun.c                       |  10 +-
 rts/ghc.mk                          |   8 +-
 rules/build-dependencies.mk         |   2 +-
 rules/build-package-data.mk         |   6 +-
 rules/build-perl.mk                 |  35 ++--
 rules/build-prog.mk                 |  30 ++-
 rules/distdir-opts.mk               |   5 +-
 rules/extra-packages.mk             |  48 -----
 rules/foreachLibrary.mk             |  43 ++++
 rules/haddock.mk                    |   9 +-
 rules/hs-suffix-rules-srcdir.mk     |   4 +-
 rules/manual-package-config.mk      |   4 +-
 rules/package-config.mk             |   4 +-
 rules/pretty_commands.mk            |   2 +-
 rules/shell-wrapper.mk              |   4 +-
 utils/compare_sizes/ghc.mk          |   2 +-
 utils/count_lines/ghc.mk            |   2 +-
 utils/deriveConstants/ghc.mk        |   2 +-
 utils/genapply/ghc.mk               |   2 +-
 utils/genprimopcode/ghc.mk          |   2 +-
 utils/ghc-cabal/ghc.mk              |  34 +--
 utils/ghc-pkg/ghc.mk                |  10 +-
 utils/ghc-pwd/ghc.mk                |   2 +-
 utils/ghctags/ghc.mk                |   2 +-
 utils/hp2ps/ghc.mk                  |   2 +-
 utils/hpc/ghc.mk                    |   2 +-
 utils/mkUserGuidePart/ghc.mk        |   2 +-
 utils/runghc/ghc.mk                 |   4 +-
 utils/touchy/ghc.mk                 |   2 +-
 utils/unlit/ghc.mk                  |   2 +-
 63 files changed, 881 insertions(+), 854 deletions(-)