From 9793a6de1c63fe60154e13e28ad75ad7a92a2766 Mon Sep 17 00:00:00 2001 From: Bruce Cran Date: Sun, 13 Jan 2013 17:10:25 +0000 Subject: [PATCH] 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 --- configure | 18 ++++++++++++++---- engines/windowsaio.c | 7 ------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 3558bf48..1ab2c7ab 100755 --- 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 f1b0bc51..773f027c 100644 --- 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; -- 2.25.1