Commit 713ff920 authored by Tamar Christina's avatar Tamar Christina
Browse files

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
parent bf3952ed
Subproject commit 06d584916a4c32e6d31b60499afd52e32e4281ef
Subproject commit 67c5cc56f0faeacc553471c8a7d9b9b95e011731
......@@ -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(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment