[commit: ghc] wip/angerman/win32-cross: Merge branches 'feature/D4430-win32-fixes', 'feature/D4436-iserv-split-8.6' and 'feature/D4439-win32-bump-hsc2hs' into work (d300e59)

[git at git.haskell.org]

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

On branch  : wip/angerman/win32-cross
Link       : http://ghc.haskell.org/trac/ghc/changeset/d300e59b2dac9e84e58ca0126382ea77f55a80f7/ghc

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

commit d300e59b2dac9e84e58ca0126382ea77f55a80f7
Merge: 3483423 6c5fdd9 e135e8c a49fff5
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Fri Feb 23 09:38:28 2018 +0800

    Merge branches 'feature/D4430-win32-fixes', 'feature/D4436-iserv-split-8.6' and 'feature/D4439-win32-bump-hsc2hs' into work



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

d300e59b2dac9e84e58ca0126382ea77f55a80f7
 .gitignore                                         |   3 +-
 configure.ac                                       |   4 +
 ghc.mk                                             |  13 +--
 libraries/base/cbits/Win32Utils.c                  |   2 +
 {iserv => libraries/libiserv}/Makefile             |   0
 {iserv => libraries/libiserv}/cbits/iservmain.c    |   0
 libraries/libiserv/ghc.mk                          |   5 +
 libraries/libiserv/libiserv.cabal                  |  39 +++++++
 {iserv => libraries/libiserv}/proxy-src/Remote.hs  |   0
 {iserv => libraries/libiserv}/src/GHCi/Utils.hsc   |   0
 {iserv => libraries/libiserv}/src/Lib.hs           |   0
 .../libiserv}/src/Remote/Message.hs                |   0
 {iserv => libraries/libiserv}/src/Remote/Slave.hs  |   0
 mk/build.mk.sample                                 |   7 +-
 mk/config.mk.in                                    |   8 +-
 mk/flavours/{quick-cross.mk => quick-cross-ncg.mk} |   4 +-
 rts/PathUtils.c                                    |   5 +
 rts/win32/OSMem.c                                  |   2 +-
 {iserv => utils/iserv-proxy}/Makefile              |   0
 utils/iserv-proxy/ghc.mk                           | 113 +++++++++++++++++++++
 .../iserv-proxy/iserv-proxy.cabal                  |  72 +------------
 .../Remote.hs => utils/iserv-proxy/src/Main.hs     |   0
 utils/{hp2ps => iserv}/Makefile                    |   2 +-
 {iserv => utils/iserv}/cbits/iservmain.c           |   0
 {iserv => utils/iserv}/ghc.mk                      |  66 ++++++------
 utils/iserv/iserv.cabal                            |  44 ++++++++
 {iserv => utils/iserv}/src/Main.hs                 |   0
 27 files changed, 273 insertions(+), 116 deletions(-)