X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=configure;h=f730dfdb369947d6b1d77d98ff0e78ffe5a5ae13;hb=836fcc0fceb233ebcc41ee63b4ea5cae20b678a4;hp=9cdfc4984e33cb768b4b477d94253b0be52e70a3;hpb=67bf982340d95ca98098ea050b54b4c7adb116c0;p=fio.git

diff --git a/configure b/configure
index 9cdfc498..f730dfdb 100755
--- a/configure
+++ b/configure
@@ -102,10 +102,20 @@ cpu=""
 
 cc="${CC-${cross_prefix}gcc}"
 
+# parse options
+for opt do
+  optarg=`expr "x$opt" : 'x[^=]*=\(.*\)'`
+  case "$opt" in
+  --cc=*) CC="$optarg"
+  ;;
+  *)
+  echo "Bad option $opt"
+  exit 1
+  esac
+done
+
 if check_define __linux__ ; then
   targetos="Linux"
-elif check_define _WIN32 ; then
-  targetos='MINGW32'
 elif check_define __OpenBSD__ ; then
   targetos='OpenBSD'
 elif check_define __sun__ ; then
@@ -134,6 +144,24 @@ SunOS)
   if test -z "$cpu" && test "$(isainfo -k)" = "amd64"; then
     cpu="x86_64"
   fi
+  ;;
+CYGWIN*)
+  echo "Forcing known good options on Windows"
+  if test -z "$CC" ; then
+    CC="x86_64-w64-mingw32-gcc"
+  fi
+  echo "CC=$CC"                    >  $config_host_mak
+  echo "CONFIG_LITTLE_ENDIAN=y"    >> $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_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 0
 esac
 
 if test ! -z "$cpu" ; then
@@ -209,15 +237,30 @@ if test -z $CC; then
     else
       CC=gcc
     fi
-  elif test "$targetos" = "MINGW32"; then
-    CC=x86_64-w64-mingw32-gcc
   fi
 fi
 
 cc="${CC-${cross_prefix}gcc}"
 
+##########################################
+# check endianness
+bigendian="no"
+cat > $TMPC <<EOF
+#include <inttypes.h>
+int main(void)
+{
+  volatile uint32_t i=0x01234567;
+  return (*((uint8_t*)(&i))) == 0x67;
+}
+EOF
+if compile_prog "" "" "endian"; then
+  $TMPE && bigendian="yes"
+fi
+
+
 echo "Operating system              $targetos"
 echo "CPU                           $cpu"
+echo "Big endian                    $bigendian"
 echo "Compiler                      $cc"
 echo
 
@@ -585,7 +628,12 @@ int main(int argc, char **argv)
   return ioctl(0, EXT4_IOC_MOVE_EXT, &me);
 }
 EOF
-if compile_prog "" "" "ext4 move extent"; then
+if compile_prog "" "" "ext4 move extent" ; then
+  ext4_me="yes"
+elif test $targetos = "Linux" ; then
+  # On Linux, just default to it on and let it error at runtime if we really
+  # don't have it. None of my updated systems have it defined, but it does
+  # work. Takes a while to bubble back.
   ext4_me="yes"
 fi
 echo "EXT4 move extent              $ext4_me"
@@ -628,14 +676,15 @@ echo "GUASI                         $guasi"
 # fusion-aw probe
 fusion_aw="no"
 cat > $TMPC << EOF
-#include <vsl_dp_experimental/vectored_write.h>
+#include <nvm/vectored_write.h>
 int main(int argc, char **argv)
 {
   struct vsl_iovec iov;
   return vsl_vectored_write(0, &iov, 0, O_ATOMIC);
 }
 EOF
-if compile_prog "" "" "fusion-aw"; then
+if compile_prog "" "-L/usr/lib/fio -lnvm-primitives" "fusion-aw"; then
+  LIBS="-L/usr/lib/fio -lnvm-primitives $LIBS"
   fusion_aw="yes"
 fi
 echo "Fusion-io atomic engine       $fusion_aw"
@@ -755,6 +804,11 @@ else
   echo "Unknown wordsize!"
   exit 1
 fi
+if test "$bigendian" = "yes" ; then
+  echo "CONFIG_BIG_ENDIAN=y" >> $config_host_mak
+else
+  echo "CONFIG_LITTLE_ENDIAN=y" >> $config_host_mak
+fi
 if test "$libaio" = "yes" ; then
   echo "CONFIG_LIBAIO=y" >> $config_host_mak
 fi