From 713ff9207e0f2493bd498ff725012c9895f728c8 Mon Sep 17 00:00:00 2001
From: Tamar Christina <tamar@zhox.com>
Date: Sat, 18 Mar 2017 15:19:01 +0000
Subject: 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
---
rts/linker/PEi386.c | 2 ++
1 file changed, 2 insertions(+)
(limited to 'rts/linker')
diff --git a/rts/linker/PEi386.c b/rts/linker/PEi386.c
index 9c7f4db1ed..c27dd31c01 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(
--
cgit v1.2.1