[commit: ghc] master: Merge branch 'master' of http://git.haskell.org/ghc (85aba49)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/85aba4961a533bfb3f26314d854de19b781093ac/ghc

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

commit 85aba4961a533bfb3f26314d854de19b781093ac
Merge: 48089cc 6ecf19c
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Oct 7 08:03:58 2014 +0100

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



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

85aba4961a533bfb3f26314d854de19b781093ac
 .gitignore                                         |   1 +
 aclocal.m4                                         |  56 +++++++
 compiler/ghc.mk                                    |  94 ++++++-----
 compiler/main/DriverPipeline.hs                    |  28 +++-
 configure.ac                                       |   7 +-
 docs/users_guide/phases.xml                        |  79 +++++++++
 ghc.mk                                             |   1 +
 includes/ghc.mk                                    |  39 ++++-
 libraries/base/Data/Proxy.hs                       |   4 +
 mk/project.mk.in                                   |   2 +
 rts/Linker.c                                       |   1 +
 rts/Printer.c                                      |  15 +-
 rts/RtsStartup.c                                   |   6 +
 testsuite/config/ghc                               |  22 ++-
 testsuite/driver/runtests.py                       |  67 ++++----
 testsuite/driver/testlib.py                        | 185 +++++++++++----------
 testsuite/driver/testutil.py                       |  34 ++++
 testsuite/tests/ffi/should_run/all.T               |  10 +-
 testsuite/tests/numeric/should_run/all.T           |   8 +-
 testsuite/tests/perf/compiler/all.T                |   2 +-
 .../tests/programs/seward-space-leak/Main.lhs      |   2 +
 testsuite/tests/th/all.T                           |   6 +-
 .../tests/typecheck/should_run/T1735_Help/State.hs |  10 ++
 testsuite/tests/typecheck/should_run/T5751.hs      |   2 +-
 testsuite/tests/typecheck/should_run/all.T         |   4 +-
 testsuite/tests/typecheck/should_run/tcrun036.hs   |   2 +
 testsuite/timeout/calibrate                        |   2 +-
 testsuite/timeout/timeout.py                       |   2 +-
 utils/fingerprint/fingerprint.py                   |   8 +-
 29 files changed, 475 insertions(+), 224 deletions(-)