[commit: ghc] ghc-8.2: Merge commit '7ce9ead4fddfbffb5cb63cce0f1b4533b7bcc0ad' into ghc-8.2 (52b5140)

git at git.haskell.org git at git.haskell.org
Sun Dec 23 18:47:05 UTC 2018


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

On branch  : ghc-8.2
Link       : http://ghc.haskell.org/trac/ghc/changeset/52b514003c60492f21790a823c488c49ec5fc89d/ghc

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

commit 52b514003c60492f21790a823c488c49ec5fc89d
Merge: 2fc8ce5 7ce9ead
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Oct 11 10:31:58 2018 -0400

    Merge commit '7ce9ead4fddfbffb5cb63cce0f1b4533b7bcc0ad' into ghc-8.2
    
    John Ericson from Obsidian Systems proposed that we merge these
    backports, which Obsidian bases its cross-compiled builds on, to the
    upstream stable branch. I don't see why not.



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

52b514003c60492f21790a823c488c49ec5fc89d
 aclocal.m4                                 |  92 +++++-----
 compiler/ghc.mk                            |   2 +
 compiler/llvmGen/LlvmCodeGen.hs            |  11 +-
 compiler/llvmGen/LlvmCodeGen/Ppr.hs        |  63 +------
 compiler/main/DriverPipeline.hs            | 272 ++++++++++++++++-------------
 compiler/main/DynFlags.hs                  |  36 +++-
 compiler/main/GHC.hs                       |   3 +-
 compiler/main/HscTypes.hs                  |   1 -
 compiler/main/SysTools.hs                  |  27 ++-
 compiler/nativeGen/RegAlloc/Linear/Main.hs |   2 +-
 compiler/specialise/SpecConstr.hs          |   4 +-
 compiler/typecheck/TcCanonical.hs          |   2 +-
 compiler/typecheck/TcInteract.hs           |   4 +-
 compiler/utils/Platform.hs                 |  14 --
 configure.ac                               |   9 +-
 docs/users_guide/phases.rst                |   8 +-
 ghc.mk                                     |   7 +-
 ghc/GHCi/UI.hs                             |   4 +-
 ghc/Main.hs                                |   2 +-
 ghc/ghc.mk                                 |   5 +
 libraries/base/configure.ac                |   2 +-
 llvm-targets                               |  25 +++
 mk/config.mk.in                            |   1 +
 mk/project.mk.in                           |  37 ++--
 settings.in                                |   3 +-
 testsuite/mk/ghc-config.hs                 |   1 +
 testsuite/tests/perf/compiler/all.T        |   6 +-
 utils/llvm-targets/gen-data-layout.sh      | 104 +++++++++++
 utils/mkUserGuidePart/Options/Linking.hs   |   7 +-
 29 files changed, 463 insertions(+), 291 deletions(-)



More information about the ghc-commits mailing list