Yesterday's (6/28) Git (gdi32) updates break 64-bit compilation.

[Evil Jay]

The updates in yesterday's Git tree have broken compilation under
64-bit.  Previously, it was working.

I entered a bugzilla entry for it
(http://bugs.winehq.org/show_bug.cgi?id=6304), but thought I would
mention it here too - since I think it's a pretty big deal and it
doesn't seem that many of the developers here are working under 64-bit
(and therefore wouldn't notice the issue).


------------------------

../../tools/winegcc/winegcc -B../../tools/winebuild -shared ./gdi32.spec
dispdib.spec.o gdi.exe.spec.o wing.spec.o bidi16.o dispdib.o env.o gdi16.o
metafile16.o wing.o  bidi.o bitblt.o bitmap.o brush.o clipping.o dc.o dib.o
driver.o enhmetafile.o enhmfdrv/bitblt.o enhmfdrv/dc.o enhmfdrv/graphics.o
enhmfdrv/init.o enhmfdrv/mapping.o enhmfdrv/objects.o font.o freetype.o
gdi_main.o gdiobj.o icm.o mapping.o metafile.o mfdrv/bitblt.o mfdrv/dc.o
mfdrv/graphics.o mfdrv/init.o mfdrv/mapping.o mfdrv/objects.o mfdrv/text.o
painting.o palette.o path.o pen.o printdrv.o region.o    version.res   -o
gdi32.dll.so  -ladvapi32 -lkernel32 -lntdll  /usr/lib/libsicuuc.a
/usr/lib/libsicudata.a -lstdc++ -lgcc_s ../../libs/port/libwine_port.a -L/lib32
-L/usr/lib32 -Wl,-rpath,/lib32 -Wl,-rpath,/usr/lib32
ld: Relocatable linking with relocations from format elf64-x86-64
(/usr/lib/libsicuuc.a(ubidi.ao)) to format elf32-i386 (gdi32.n0hnjc.o) is not
supported
winebuild: ld -m elf_i386 -r failed with status 256
winegcc: ../../tools/winebuild/winebuild failed.
make[2]: *** [gdi32.dll.so] Error 2
make[2]: Leaving directory `/data/install/wine/dlls/gdi'
make[1]: *** [gdi] Error 2
make[1]: Leaving directory `/data/install/wine/dlls'
make: *** [dlls] Error 2


-J