[commit: ghc] wip/angerman/llvmng: Merge branches 'feature/D4121-reloc-paths', 'feature/D4135-ghc-version', 'feature/D4174-rts-cabal', 'feature/D4175-compiler-LICENSE' and 'feature/D4176-base-cmm-files' into wip/angerman/llvmng (2d67ef3)

Sat Nov 11 08:35:35 UTC 2017

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

On branch  : wip/angerman/llvmng
Link       : http://ghc.haskell.org/trac/ghc/changeset/2d67ef358dd83adda497e439a76a75701fabd625/ghc

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

commit 2d67ef358dd83adda497e439a76a75701fabd625
Merge: 8af0c1b d390e35 edfbeb0 6ad8d6c 043bfaf 5b22f81
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Fri Nov 10 10:52:31 2017 +0800

    Merge branches 'feature/D4121-reloc-paths', 'feature/D4135-ghc-version', 'feature/D4174-rts-cabal', 'feature/D4175-compiler-LICENSE' and 'feature/D4176-base-cmm-files' into wip/angerman/llvmng


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

2d67ef358dd83adda497e439a76a75701fabd625
 aclocal.m4                      |   9 +-
 compiler/ghc.cabal.in           |   2 +-
 compiler/main/DriverPipeline.hs |  11 +-
 compiler/main/DynFlags.hs       |   7 ++
 compiler/main/SysTools.hs       |  21 ++++
 configure.ac                    |  29 ++++-
 libraries/Cabal                 |   2 +-
 libraries/base/base.cabal       |   3 +
 rts/rts.cabal.in                | 272 ++++++++++++++++++++++++++++++++++++++++
 utils/ghc-cabal/Main.hs         |   3 +-
 utils/ghc-pkg/Main.hs           |   6 +
 11 files changed, 351 insertions(+), 14 deletions(-)