From: Huadong Liu <HLiu@fusionio.com>
Date: Tue, 5 Feb 2013 07:43:14 +0000 (+0100)
Subject: Enable forced 32-bit build on Windows
X-Git-Tag: fio-2.0.14~36
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=7409711b543a1e4f124bd24fa4d8265db9fc4c52;ds=sidebyside

Enable forced 32-bit build on Windows

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/README b/README
index 4c7b542a..41732376 100644
--- a/README
+++ b/README
@@ -125,6 +125,9 @@ How to compile FIO on 64-bit Windows:
  5. Run 'make clean'.
  6. Run 'make'.
 
+To build fio on 32-bit Windows, download x86/pthreadGC2.dll instead and do
+'./configure --build-32bit-win=yes' before 'make'.
+
 
 Command line
 ------------
diff --git a/configure b/configure
index 078dab88..c0114367 100755
--- a/configure
+++ b/configure
@@ -133,6 +133,8 @@ for opt do
   ;;
   --extra-cflags=*) CFLAGS="$CFLAGS $optarg"
   ;;
+  --build-32bit-win=*) build_32bit_win="$optarg"
+  ;;
   --help)
   show_help="yes"
   ;;
@@ -183,10 +185,18 @@ SunOS)
 CYGWIN*)
   echo "Forcing known good options on Windows"
   if test -z "$CC" ; then
-    CC="x86_64-w64-mingw32-gcc"
+    if test ! -z "$build_32bit_win" && test "$build_32bit_win" = "yes"; then
+      CC="i686-w64-mingw32-gcc"
+    else
+      CC="x86_64-w64-mingw32-gcc"
+    fi
   fi
   output_sym "CONFIG_LITTLE_ENDIAN"
-  output_sym "CONFIG_64BIT_LLP64"
+  if test ! -z "$build_32bit_win" && test "$build_32bit_win" = "yes"; then
+    output_sym "CONFIG_32BIT"
+  else
+    output_sym "CONFIG_64BIT_LLP64"
+  fi
   output_sym "CONFIG_FADVISE"
   output_sym "CONFIG_SOCKLEN_T"
   output_sym "CONFIG_POSIX_FALLOCATE"