Fix configure script for 64-bit Windows.

Hard-code config options when building using MinGW-w64 on Windows.
For 32-bit builds, CC and CONFIG_32BIT/CONFIG_64BIT will need to be
updated manually.

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

diff --git a/configure b/configure
index 3558bf48e9a52752c74fd7ce8a6a20a26fd9c829..1ab2c7abb29d3252fd204ec7d4f51714f7dc0797 100755 (executable)
--- a/configure
+++ b/configure
@@ -104,8 +104,20 @@ cc="${CC-${cross_prefix}gcc}"
 
 if check_define __linux__ ; then
   targetos="Linux"
-elif check_define _WIN32 ; then
-  targetos='MINGW32'
+elif test `uname -o` = Cygwin ; then
+  echo "Forcing known good options on Windows"
+  echo "CC=x86_64-w64-mingw32-gcc" >> $config_host_mak
+  echo "CONFIG_64BIT_LLP64=y"      >> $config_host_mak
+  echo "CONFIG_CLOCK_GETTIME=y"    >> $config_host_mak
+  echo "CONFIG_CLOCK_MONOTONIC=y"  >> $config_host_mak
+  echo "CONFIG_GETTIMEOFDAY=y"     >> $config_host_mak
+  echo "CONFIG_FADVISE=y"          >> $config_host_mak
+  echo "CONFIG_STRSEP=y"           >> $config_host_mak
+  echo "CONFIG_SOCKLEN_T=y"        >> $config_host_mak
+  echo "CONFIG_POSIX_FALLOCATE=y"  >> $config_host_mak
+  echo "CONFIG_FADVISE=y"          >> $config_host_mak
+  echo "CONFIG_SFAA=y"             >> $config_host_mak
+  exit
 elif check_define __OpenBSD__ ; then
   targetos='OpenBSD'
 elif check_define __sun__ ; then
@@ -209,8 +221,6 @@ if test -z $CC; then
     else
       CC=gcc
     fi
-  elif test "$targetos" = "MINGW32"; then
-    CC=x86_64-w64-mingw32-gcc
   fi
 fi
 

diff --git a/engines/windowsaio.c b/engines/windowsaio.c
index f1b0bc51f4e8487c91439d8b14a93b7b6bf977fb..773f027c0e424000cbeaf1137fd44fb04e148798 100644 (file)
--- a/engines/windowsaio.c
+++ b/engines/windowsaio.c
@@ -126,13 +126,6 @@ static int win_to_posix_error(DWORD winerr)
        return winerr;
 }
 
-int sync_file_range(int fd, off64_t offset, off64_t nbytes,
-                          unsigned int flags)
-{
-       errno = ENOSYS;
-       return -1;
-}
-
 static int fio_windowsaio_init(struct thread_data *td)
 {
        struct windowsaio_data *wd;