Fix: use clock_get_time for caa_get_cycles fallback on MacOSX

[urcu.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5162db39261f4cbccc18893ae63589db756ff79f..cf9964b45a2a489427483dc1647abb0a2f196fec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([userspace-rcu],[0.8.0],[mathieu dot desnoyers at efficios dot com], [], [http://liburcu.org/])
+AC_INIT([userspace-rcu],[0.9.0],[mathieu dot desnoyers at efficios dot com], [], [http://liburcu.org/])
 
 # Following the numbering scheme proposed by libtool for the library version
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
@@ -25,6 +25,7 @@ AH_TEMPLATE([CONFIG_RCU_HAVE_FUTEX], [Defined when on a system with futex suppor
 AH_TEMPLATE([CONFIG_RCU_COMPAT_ARCH], [Compatibility mode for i386 which lacks cmpxchg instruction.])
 AH_TEMPLATE([CONFIG_RCU_ARM_HAVE_DMB], [Use the dmb instruction if available for use on ARM.])
 AH_TEMPLATE([CONFIG_RCU_TLS], [TLS provided by the compiler.])
+AH_TEMPLATE([CONFIG_RCU_HAVE_CLOCK_GETTIME], [clock_gettime() is detected.])
 
 # Allow overriding storage used for TLS variables.
 AC_ARG_ENABLE([compiler-tls],
@@ -79,7 +80,6 @@ AC_FUNC_MMAP
 AC_FUNC_FORK
 AC_CHECK_FUNCS([ \
        atexit \
-       clock_gettime \
        getcpuid \
        gettid \
        gettimeofday \
@@ -103,6 +103,7 @@ AC_CHECK_HEADERS([ \
 
 # Find arch type
 AS_CASE([$host_cpu],
+       [k1om], [ARCHTYPE="x86"],
        [i386], [ARCHTYPE="x86" && SUBARCHTYPE="x86compat"],
        [i486], [ARCHTYPE="x86"],
        [i586], [ARCHTYPE="x86"],
@@ -121,8 +122,9 @@ AS_CASE([$host_cpu],
        [alpha*], [ARCHTYPE="alpha"],
        [ia64], [ARCHTYPE="ia64"],
        [arm*], [ARCHTYPE="arm"],
-       [aarch64], [ARCHTYPE="aarch64"],
+       [aarch64*], [ARCHTYPE="aarch64"],
        [mips*], [ARCHTYPE="mips"],
+       [nios2*], [ARCHTYPE="nios2"],
        [tile*], [ARCHTYPE="tile"],
        [hppa*], [ARCHTYPE="hppa"],
        [ARCHTYPE="unknown"]
@@ -133,6 +135,11 @@ AS_CASE([$host],[*-*-linux-androideabi],
        [AM_CONDITIONAL(TARGET_IS_ANDROID, false)]
 )
 
+AS_CASE([$host],[*-cygwin*],
+       [AM_CONDITIONAL(USE_CYGWIN, true)],
+       [AM_CONDITIONAL(USE_CYGWIN, false)]
+)
+
 AC_SUBST(ARCHTYPE)
 AC_SUBST(SUBARCHTYPE)
 
@@ -189,7 +196,7 @@ AS_IF([test "x$ARCHTYPE" = "xx86"],[
        #
        #k1om is the name for the Intel MIC family (Xeon Phi). It is an x86_64
        #variant but lacks fence instructions.
-       AS_IF([test "x$host_cpu" != "xi386" -a "x$host_cpu" != "xi486" -a "x$host_cpu" != "xi586" -a "x$host_cpu" != "xi686" -a "x$host_vendor" != "xk1om"],[
+       AS_IF([test "x$host_cpu" != "xi386" -a "x$host_cpu" != "xi486" -a "x$host_cpu" != "xi586" -a "x$host_cpu" != "xi686" -a "x$host_vendor" != "xk1om" -a "x$host_cpu" != "xk1om"],[
                AC_MSG_RESULT([yes])
                AC_DEFINE([CONFIG_RCU_HAVE_FENCE], [1])
        ],[
@@ -214,6 +221,11 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
        compat_futex_test=1
 ])
 
+# Search for clock_gettime
+AC_SEARCH_LIBS([clock_gettime], [rt], [
+       AC_DEFINE([CONFIG_RCU_HAVE_CLOCK_GETTIME], [1])
+], [])
+
 # Check for pthread
 AC_CHECK_LIB([pthread], [pthread_create],
        [AM_CONDITIONAL(LIBC_INCLUDES_PTHREAD, false)],