X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=configure.ac;h=1f499c733e492f519dfadb4c3aa575cae6181009;hp=017da5a552508718201642785f0fb9d1b0c80450;hb=b72f6acbd36aeb32c9f5345082a8d0bdd779a9aa;hpb=d7c76f85442125bcfef40f58b1c6fc1bd5ce4ffd diff --git a/configure.ac b/configure.ac index 017da5a..1f499c7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ AC_PREREQ(2.59) -AC_INIT([userspace-rcu],[0.11.0-pre],[mathieu dot desnoyers at efficios dot com], [], [http://liburcu.org/]) +AC_INIT([userspace-rcu],[0.12.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 -AC_SUBST([URCU_LIBRARY_VERSION], [6:0:0]) +AC_SUBST([URCU_LIBRARY_VERSION], [7:0:1]) AC_CONFIG_HEADERS([include/config.h include/urcu/config.h]) AC_CONFIG_AUX_DIR([config]) @@ -12,7 +12,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_TARGET AC_CANONICAL_HOST -AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip nostdinc]) +AM_INIT_AUTOMAKE([1.12 foreign dist-bzip2 no-dist-gzip nostdinc]) AM_MAINTAINER_MODE([enable]) # Enable silent rules if available (Introduced in AM 1.11) @@ -21,14 +21,10 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_REQUIRE_AUX_FILE([tap-driver.sh]) AH_TEMPLATE([CONFIG_RCU_SMP], [Enable SMP support. With SMP support enabled, uniprocessors are also supported. With SMP support disabled, UP systems work fine, but the behavior of SMP systems is undefined.]) -AH_TEMPLATE([CONFIG_RCU_HAVE_FENCE], [Defined when on a system that has memory fence instructions.]) -AH_TEMPLATE([CONFIG_RCU_HAVE_FUTEX], [Defined when on a system with futex support.]) -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.]) AH_TEMPLATE([CONFIG_RCU_FORCE_SYS_MEMBARRIER], [Require the operating system to support the membarrier system call for default and bulletproof flavors.]) -AH_TEMPLATE([CONFIG_RCU_DEBUG], [Enable internal debugging self-checks. Introduce performance penalty.]) +AH_TEMPLATE([CONFIG_RCU_DEBUG], [Enable internal debugging self-checks. Introduces a performance penalty.]) AH_TEMPLATE([CONFIG_CDS_LFHT_ITER_DEBUG], [Enable extra debugging checks for lock-free hash table iterator traversal. Alters the rculfhash ABI. Make sure to compile both library and application with matching configuration.]) # Allow requiring the operating system to support the membarrier system @@ -45,19 +41,12 @@ AC_ARG_ENABLE([compiler-tls], [def_compiler_tls=$enableval], [def_compiler_tls="yes"]) -# If not overridden, use ax_tls.m4 to check if TLS is available. -AS_IF([test "x$def_compiler_tls" = "xyes"], - [AX_TLS([def_tls_detect=$ac_cv_tls], [:])], - [:]) - -AS_IF([test "x$def_tls_detect" = "x"], - [:], - [AC_DEFINE_UNQUOTED([CONFIG_RCU_TLS], $def_tls_detect)]) - # Checks for C compiler AC_USE_SYSTEM_EXTENSIONS AC_PROG_CC -AC_PROG_CC_STDC +# AC_PROG_CC_STDC was merged in AC_PROG_CC in autoconf 2.70 +m4_version_prereq([2.70], [], [AC_PROG_CC_STDC]) +AS_IF([test "x$def_compiler_tls" = "xyes"], AC_DEFINE([CONFIG_RCU_TLS], [1]), [:]) # Checks for programs. AC_PROG_AWK @@ -125,133 +114,17 @@ AC_CHECK_HEADERS([ \ sys/time.h \ ]) -# Find arch type -AS_CASE([$host_cpu], - [k1om], [ARCHTYPE="x86"], - [i386], [ARCHTYPE="x86" && SUBARCHTYPE="x86compat"], - [i486], [ARCHTYPE="x86"], - [i586], [ARCHTYPE="x86"], - [i686], [ARCHTYPE="x86"], - [amd64], [ARCHTYPE="x86"], - [x86_64], [ARCHTYPE="x86"], - [powerpc], [ARCHTYPE="ppc"], - [ppc64], [ARCHTYPE="ppc"], - [powerpc64], [ARCHTYPE="ppc"], - [powerpc64le], [ARCHTYPE="ppc"], - [ppc], [ARCHTYPE="ppc"], - [s390], [ARCHTYPE="s390"], - [s390x], [ARCHTYPE="s390"], - [sparc], [ARCHTYPE="sparc64"], - [sparc64], [ARCHTYPE="sparc64"], - [alpha*], [ARCHTYPE="alpha"], - [ia64], [ARCHTYPE="ia64"], - [arm*], [ARCHTYPE="arm"], - [aarch64*], [ARCHTYPE="aarch64"], - [mips*], [ARCHTYPE="mips"], - [nios2*], [ARCHTYPE="nios2"], - [tile*], [ARCHTYPE="tile"], - [hppa*], [ARCHTYPE="hppa"], - [m68k], [ARCHTYPE="m68k"], - [riscv*], [ARCHTYPE="riscv"], - [ARCHTYPE="unknown"] -) - AS_CASE([$host],[*-cygwin*], [AM_CONDITIONAL(USE_CYGWIN, true)], [AM_CONDITIONAL(USE_CYGWIN, false)] ) -AC_SUBST(ARCHTYPE) -AC_SUBST(SUBARCHTYPE) - -UATOMICSRC=include/urcu/uatomic/$ARCHTYPE.h -ARCHSRC=include/urcu/arch/$ARCHTYPE.h - -AS_IF([test "x$SUBARCHTYPE" = xx86compat],[ - AC_DEFINE([CONFIG_RCU_COMPAT_ARCH], [1]) -]) - -AS_IF([test "$host_cpu" = "armv7l"],[ - AM_CFLAGS="$AM_CFLAGS -mcpu=cortex-a9 -mtune=cortex-a9 -O1" -]) - -# ARM-specific checks -AS_IF([test "x$ARCHTYPE" = "xarm"],[ - AC_MSG_CHECKING([for dmb instruction]) - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - int main() - { - asm volatile("dmb":::"memory"); - return 0; - } - ]]) - ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE([CONFIG_RCU_ARM_HAVE_DMB], [1]) - ],[ - AC_MSG_RESULT([no]) - ]) -]) - -# Tile-specific checks -AS_IF([echo "$host_cpu" | grep "^tile"],[ - AC_MSG_CHECKING([for Tile architecture type]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #ifndef __tilegx__ - #error - #endif - ]]) - ],[ - AC_MSG_RESULT([ok]) - ],[ - AC_MSG_FAILURE([URCU has only been tested on the TileGx architecture. For other Tile* architectures, please run the tests first and report the results to the maintainer so that proper support can be added.]) - ]) -]) - -# x86-specific checks -AS_IF([test "x$ARCHTYPE" = "xx86"],[ - AC_MSG_CHECKING([if architecture really supports the mfence instruction]) - #For now, using lock; addl compatibility mode even for i686, because the - #Pentium III is seen as a i686, but lacks mfence instruction. - #Only using fence for x86_64. - # - #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" -a "x$host_cpu" != "xk1om"],[ - AC_MSG_RESULT([yes]) - AC_DEFINE([CONFIG_RCU_HAVE_FENCE], [1]) - config_rcu_have_fence=yes - ],[ - AC_MSG_RESULT([no]) - config_rcu_have_fence=no - ]) -]) - -# Check if sys_futex() is available -AC_MSG_CHECKING([for sys_futex()]) -AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #include - #ifndef __NR_futex - #error "futexes not available" - #endif - ]]) -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE([CONFIG_RCU_HAVE_FUTEX], [1]) - compat_futex_test=0 -],[ - AC_MSG_RESULT([no]) - compat_futex_test=1 -]) - # Search for clock_gettime AC_SEARCH_LIBS([clock_gettime], [rt], [ AC_DEFINE([CONFIG_RCU_HAVE_CLOCK_GETTIME], [1]) config_rcu_have_clock_gettime=yes ], []) -AM_CONDITIONAL([COMPAT_FUTEX], [test "x$compat_futex_test" = "x1"]) -AM_CONDITIONAL([COMPAT_ARCH], [test "x$SUBARCHTYPE" = "xx86compat"]) AM_CONDITIONAL([NO_SHARED], [test "x$enable_shared" = "xno"]) # smp-support configure option @@ -264,7 +137,7 @@ AS_IF([test "x$def_smp_support" = "xyes"], [AC_DEFINE([CONFIG_RCU_SMP], [1])]) # RCU debugging option AC_ARG_ENABLE([rcu-debug], AS_HELP_STRING([--enable-rcu-debug], [Enable internal debugging - self-checks. Introduce performance penalty.])) + self-checks. Introduces a performance penalty.])) AS_IF([test "x$enable_rcu_debug" = "xyes"], [ AC_DEFINE([CONFIG_RCU_DEBUG], [1]) ]) @@ -332,7 +205,7 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ #include int main() { - cpu_set_t foo, mask; CPU_SET(0, &foo); + cpu_set_t foo; CPU_SET(0, &foo); return 0; } ]]) @@ -381,13 +254,9 @@ AC_CHECK_FUNCS([sched_setaffinity],[ AM_CPPFLAGS="-include config.h" AC_SUBST(AM_CPPFLAGS) -AM_CFLAGS="-Wall -Wextra -Wno-unused-parameter -Wno-sign-compare $AM_CFLAGS" +AM_CFLAGS="-Wall -Wextra -Wno-unused-parameter $AM_CFLAGS" AC_SUBST(AM_CFLAGS) -AC_CONFIG_LINKS([ - include/urcu/arch.h:$ARCHSRC - include/urcu/uatomic.h:$UATOMICSRC -]) AC_CONFIG_FILES([ Makefile doc/Makefile @@ -492,16 +361,8 @@ PPRINT_PROP_STRING([Target architecture], $host_cpu) test "x$def_smp_support" = "xyes" && value=1 || value=0 PPRINT_PROP_BOOL([SMP support], $value) -# Memory fence support available -test "x$config_rcu_have_fence" = "xyes" && value=1 || value=0 -PPRINT_PROP_BOOL([Memory fence instructions], $value) - -# Futex support available -test "x$compat_futex_test" = "x0" && value=1 || value=0 -PPRINT_PROP_BOOL([Futex support], $value) - # TLS -test "x$def_tls_detect" = "x" && value="pthread_getspecific()" || value="$def_tls_detect" +test "x$def_compiler_tls" = "xyes" && value="compiler TLS" || value="pthread_getspecific()" PPRINT_PROP_STRING([Thread Local Storage (TLS)], [$value]) # clock_gettime() available