diff options
| author | Tamar Christina <tamar@zhox.com> | 2017-03-18 15:19:01 +0000 |
|---|---|---|
| committer | Tamar Christina <tamar@zhox.com> | 2017-03-20 18:19:24 +0000 |
| commit | 713ff9207e0f2493bd498ff725012c9895f728c8 (patch) | |
| tree | b3d3609aac61f74ac5861003cf004e74b15892b8 /rts | |
| parent | bf3952ed0f3d4c3ed2ddeb4a0de1b4c16df4a250 (diff) | |
| download | haskell-713ff9207e0f2493bd498ff725012c9895f728c8.tar.gz | |
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
Diffstat (limited to 'rts')
| -rw-r--r-- | rts/linker/PEi386.c | 2 |
1 files changed, 2 insertions, 0 deletions
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( |