[commit: ghc] fix#7704: Merge remote branch 'origin/master' into fix#7704 (4d529ef)

[Simon Peyton Jones]

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

On branch  : fix#7704

http://hackage.haskell.org/trac/ghc/changeset/4d529efbd7b1a9d8921502772cf7d7b1144e74c5

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

commit 4d529efbd7b1a9d8921502772cf7d7b1144e74c5
Merge: b562d34 f46ac1a
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Mar 4 20:36:51 2013 +0000

    Merge remote branch 'origin/master' into fix#7704

 HACKING                             |  63 -----
 HACKING.md                          | 149 +++++++++++
 README.md                           |  67 +++--
 aclocal.m4                          |   6 +-
 bindisttest/ghc.mk                  |   2 +-
 boot                                |   7 +-
 compiler/deSugar/Coverage.lhs       |   3 +
 compiler/deSugar/DsArrows.lhs       | 484 ++++++++++++++++++++----------------
 compiler/ghc.mk                     |  68 ++---
 compiler/ghci/Linker.lhs            |  31 ++-
 compiler/hsSyn/HsExpr.lhs           |  17 +-
 compiler/hsSyn/HsUtils.lhs          |   7 +-
 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/parser/Parser.y.pp         |   4 +-
 compiler/parser/RdrHsSyn.lhs        |   4 +-
 compiler/rename/RnExpr.lhs          |   4 +-
 compiler/rename/RnTypes.lhs         |   2 +-
 compiler/simplCore/CoreMonad.lhs    |   4 +-
 compiler/typecheck/TcArrows.lhs     | 272 +++++++++-----------
 compiler/typecheck/TcCanonical.lhs  | 150 +++++------
 compiler/typecheck/TcHsSyn.lhs      |   6 +-
 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 -
 docs/users_guide/glasgow_exts.xml   |  48 ++--
 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                     | 139 ++---------
 mk/project.mk.in                    |  13 +-
 mk/tree.mk                          |  19 --
 packages                            |  89 ++++---
 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 +-
 sync-all                            | 178 +++++--------
 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 +-
 75 files changed, 1448 insertions(+), 1430 deletions(-)