[commit: ghc] ghc-8.2: Fix Windows x86 build (4a0b1dd)

[git at git.haskell.org]

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

On branch  : ghc-8.2
Link       : http://ghc.haskell.org/trac/ghc/changeset/4a0b1dd8fe165a3f869824ad3e63fb0a5a1eb99f/ghc

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

commit 4a0b1dd8fe165a3f869824ad3e63fb0a5a1eb99f
Author: Tamar Christina <tamar at zhox.com>
Date:   Sat Mar 18 15:19:01 2017 +0000

    Fix Windows x86 build
    
    Summary:
    Fix some `-Werror` failures and work around a
    bug in the `x86` version of `mingw-w64-crt`'s libraries.
    
    The bump in the `win32` submodule is required for this.
    
    Test Plan: ./validate
    
    Reviewers: austin, bgamari, erikd, simonmar
    
    Reviewed By: simonmar
    
    Subscribers: rwbarton, thomie
    
    Differential Revision: https://phabricator.haskell.org/D3362
    
    (cherry picked from commit 713ff9207e0f2493bd498ff725012c9895f728c8)


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

4a0b1dd8fe165a3f869824ad3e63fb0a5a1eb99f
 libraries/Win32     | 2 +-
 rts/linker/PEi386.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/Win32 b/libraries/Win32
index 06d5849..67c5cc5 160000
--- a/libraries/Win32
+++ b/libraries/Win32
@@ -1 +1 @@
-Subproject commit 06d584916a4c32e6d31b60499afd52e32e4281ef
+Subproject commit 67c5cc56f0faeacc553471c8a7d9b9b95e011731
diff --git a/rts/linker/PEi386.c b/rts/linker/PEi386.c
index 9c7f4db..c27dd31 100644
--- a/rts/linker/PEi386.c
+++ b/rts/linker/PEi386.c
@@ -1357,9 +1357,11 @@ ocResolve_PEi386 ( ObjectCode* oc )
          sym = (COFF_symbol*)
                myindex ( sizeof_COFF_symbol,
                          symtab, reltab_j->SymbolTableIndex );
+#if defined(x86_64_HOST_ARCH)
          uint64_t symIndex = ((uint64_t)myindex(sizeof_COFF_symbol, symtab,
                                                 reltab_j->SymbolTableIndex)
                                         - (uint64_t)symtab) / sizeof_COFF_symbol;
+#endif
 
          IF_DEBUG(linker,
                   debugBelch(