Ok, I've reverted those changes. Sorry for the breakage.
On 4 July 2016 at 23:44, Simon Peyton Jones
Simon, Windows is still broken.
Do you want me to revert both patches, or will you?
Simon
"inplace/bin/ghc-stage1.exe" -optc-fno-stack-protector -optc-Wall -optc-Werror -optc-Wall -optc-Wextra -optc-Wstrict-prototypes -optc-Wmissing-prototypes -optc-Wmissing-declarations -optc-Winline -optc-Waggregate-return -optc-Wpointer-arith -optc-Wmissing-noreturn -optc-Wnested-externs -optc-Wredundant-decls -optc-Iincludes -optc-Iincludes/dist -optc-Iincludes/dist-derivedconstants/header -optc-Iincludes/dist-ghcconstants/header -optc-Irts -optc-Irts/dist/build -optc-DCOMPILING_RTS -optc-fno-strict-aliasing -optc-fno-common -optc-Irts/dist/build/./autogen -optc-Wno-error=inline -optc-O2 -optc-fomit-frame-pointer -optc-g -optc-fno-omit-frame-pointer -optc-g -optc-O0 -optc-DRtsWay=\"rts_thr_debug\" -optc-DWINVER=0x06000100 -static -optc-DTHREADED_RTS -optc-DDEBUG -O0 -H64m -Wall -fllvm-fill-undef-with-garbage -Werror -Iincludes -Iincludes/dist -Iincludes/dist-derivedconstants/header -Iincludes/dist-ghcconstants/header -Irts -Irts/dist/build -DCOMPILING_RTS -this-unit-id rts -dcmm-lint -i -irts -irts/dist/build -Irts/dist/build -irts/dist/build/./autogen -Irts/dist/build/./autogen -O2 -O0 -Wnoncanonical-monad-instances -c rts/Linker.c -o rts/dist/build/Linker.thr_debug_o
In file included from rts\Linker.c:13:0: error:
rts\Linker.c: In function 'ocTryLoad':
rts\Linker.c:2566:55: error:
error: pointer type mismatch in conditional expression [-Werror]
oc->archiveMemberName : oc->fileName));
^
includes\Rts.h:300:53: error:
note: in definition of macro 'IF_DEBUG'
#define IF_DEBUG(c,s) if (RtsFlags.DebugFlags.c) { s; }
^
rts\Linker.c:2564:33: error:
error: format '%ls' expects argument of type 'wchar_t *', but argument 2 has type 'void *' [-Werror=format=]
IF_DEBUG(linker, debugBelch("Resolving %" PATH_FMT "\n",
^
includes\Rts.h:300:53: error:
note: in definition of macro 'IF_DEBUG'
#define IF_DEBUG(c,s) if (RtsFlags.DebugFlags.c) { s; }
^
cc1.exe: all warnings being treated as errors
`gcc.exe' failed in phase `C Compiler'. (Exit code: 1)
rts/ghc.mk:255: recipe for target 'rts/dist/build/Linker.debug_o' failed
make[1]: *** [rts/dist/build/Linker.debug_o] Error 1
make[1]: *** Waiting for unfinished jobs....
In file included from rts\Linker.c:13:0: error:
rts\Linker.c: In function 'ocTryLoad':
rts\Linker.c:2566:55: error:
error: pointer type mismatch in conditional expression [-Werror]
oc->archiveMemberName : oc->fileName));
^
includes\Rts.h:300:53: error:
note: in definition of macro 'IF_DEBUG'
#define IF_DEBUG(c,s) if (RtsFlags.DebugFlags.c) { s; }
^
rts\Linker.c:2564:33: error:
error: format '%ls' expects argument of type 'wchar_t *', but argument 2 has type 'void *' [-Werror=format=]
IF_DEBUG(linker, debugBelch("Resolving %" PATH_FMT "\n",
^
includes\Rts.h:300:53: error:
note: in definition of macro 'IF_DEBUG'
#define IF_DEBUG(c,s) if (RtsFlags.DebugFlags.c) { s; }
^
cc1.exe: all warnings being treated as errors
`gcc.exe' failed in phase `C Compiler'. (Exit code: 1)
rts/ghc.mk:255: recipe for target 'rts/dist/build/Linker.thr_debug_o' failed
make[1]: *** [rts/dist/build/Linker.thr_debug_o] Error 1
Makefile:129: recipe for target 'all' failed
make: *** [all] Error 2
/cygdrive/c/code/HEAD$ git log -2 rts/Linker.c
commit 01f449f4ffd2c4f23bfe5698b9f1b98a86276900
Author: Simon Marlow
Date: Mon Jul 4 10:56:04 2016 +0100
Fix 32-bit build failures
commit 6377757918c1e7f63638d6f258cad8d5f02bb6a7
Author: Simon Marlow
Date: Wed Jun 29 21:50:18 2016 +0100
Linker: some extra debugging / logging