[commit: ghc] wip/angerman/llvmng: Merge branch 'feature/fix-T14297' into wip/angerman/llvmng (e602a6d)

[git at git.haskell.org]

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

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

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

commit e602a6d6c12e50e57b69359ab40bac7f86db5326
Merge: 86c7b26 a1cfec3
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Tue Oct 3 09:16:07 2017 +0800

    Merge branch 'feature/fix-T14297' into wip/angerman/llvmng



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

e602a6d6c12e50e57b69359ab40bac7f86db5326
 ghc.mk                     | 15 +++++++++++++--
 utils/compare_sizes/ghc.mk |  4 +++-
 utils/hpc/ghc.mk           | 18 +++++++++++++++++-
 utils/hsc2hs               |  2 +-
 4 files changed, 34 insertions(+), 5 deletions(-)