From d21b09215fa616ee0f3e97be1a671c2a8f4b5002 Mon Sep 17 00:00:00 2001
From: Joel Dice <joel.dice@gmail.com>
Date: Mon, 2 Jul 2012 10:51:32 -0600
Subject: [PATCH] use i686-w64-mingw32- prefix for ia32 Windows cross compiles

Using e.g. x86_64-w64-mingw32-gcc -m32 doesn't quite work at link time
when using Debian Wheezy's gcc-mingw-w64 package, due to the 32-bit
system libraries not being in the search path, so we use
i686-w64-mingw32-gcc instead.
---
 makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/makefile b/makefile
index e97c24905d..5d2a6b2f52 100755
--- a/makefile
+++ b/makefile
@@ -407,12 +407,12 @@ ifeq ($(platform),windows)
 
 	ifeq (,$(filter mingw32 cygwin,$(build-platform)))
 		openjdk-extra-cflags += -I$(src)/openjdk/caseSensitive
-		cxx = x86_64-w64-mingw32-g++ -m32
-		cc = x86_64-w64-mingw32-gcc -m32
-		dlltool = x86_64-w64-mingw32-dlltool -mi386 --as-flags=--32 
-		ar = x86_64-w64-mingw32-ar
-		ranlib = x86_64-w64-mingw32-ranlib
-		strip = x86_64-w64-mingw32-strip --strip-all
+		cxx = i686-w64-mingw32-g++ -m32
+		cc = i686-w64-mingw32-gcc -m32
+		dlltool = i686-w64-mingw32-dlltool -mi386 --as-flags=--32 
+		ar = i686-w64-mingw32-ar
+		ranlib = i686-w64-mingw32-ranlib
+		strip = i686-w64-mingw32-strip --strip-all
 	else
 		build-system = windows
 		common-cflags += "-I$(JAVA_HOME)/include/win32"