X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=configure.ac;h=774094e0ba4b935f5f2b59a3dfb432434b62633a;hp=d064a13e00151430353af16ace1e10aff39145a5;hb=0e1efa0e8c7961fc3eca21d0268c07f44eb572e5;hpb=1000f1f4204e5fbb337f4ea911f1e29f67df79aa diff --git a/configure.ac b/configure.ac index d064a13..774094e 100644 --- a/configure.ac +++ b/configure.ac @@ -2,11 +2,11 @@ # Process this file with autoconf to produce a configure script. -AC_INIT([userspace-rcu],[0.7.4],[mathieu dot desnoyers at efficios dot com]) +AC_INIT([userspace-rcu],[0.8.0],[mathieu dot desnoyers at efficios dot com]) # 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], [2:0:0]) +AC_SUBST([URCU_LIBRARY_VERSION], [3:0:0]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_MACRO_DIR([config]) @@ -56,7 +56,7 @@ AC_TYPE_SIZE_T # Checks for library functions. AC_FUNC_MALLOC AC_FUNC_MMAP -AC_CHECK_FUNCS([bzero gettimeofday munmap sched_getcpu strtoul sysconf]) +AC_CHECK_FUNCS([bzero gettimeofday munmap sched_getcpu strtoul sysconf gettid]) # Find arch type AS_CASE([$host_cpu], @@ -72,15 +72,21 @@ AS_CASE([$host_cpu], [ppc], [ARCHTYPE="ppc"], [s390], [ARCHTYPE="s390"], [s390x], [ARCHTYPE="s390"], + [sparc], [ARCHTYPE="sparc64"], [sparc64], [ARCHTYPE="sparc64"], [alpha*], [ARCHTYPE="alpha"], [ia64], [ARCHTYPE="gcc"], [arm*], [ARCHTYPE="arm"], [mips*], [ARCHTYPE="mips"], - [tile*], [ARCHTYPE="tile"], + [tile*], [ARCHTYPE="gcc"], [ARCHTYPE="unknown"] ) +AS_CASE([$host],[*-*-linux-androideabi], + [AM_CONDITIONAL(TARGET_IS_ANDROID, true)], + [AM_CONDITIONAL(TARGET_IS_ANDROID, false)] +) + AC_SUBST(ARCHTYPE) AC_SUBST(SUBARCHTYPE) @@ -113,6 +119,21 @@ AS_IF([test "x$ARCHTYPE" = "xarm"],[ ]) ]) +# 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]) @@ -144,8 +165,18 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ compat_futex_test=1 ]) +# Check for pthread +AC_CHECK_LIB([pthread], [pthread_create], + [AM_CONDITIONAL(LIBC_INCLUDES_PTHREAD, false)], + [AC_CHECK_LIB([c], [pthread_create], + [AM_CONDITIONAL(LIBC_INCLUDES_PTHREAD, true)], + [AC_MSG_ERROR([Cannot find libpthread. Use [LDFLAGS]=-Ldir to specify its location.])] + )] +) + 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 AC_ARG_ENABLE([smp-support], @@ -187,6 +218,49 @@ AS_IF([test "x$def_smp_support" = "xyes"], [AC_DEFINE([CONFIG_RCU_SMP], [1])]) saved_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -D_GNU_SOURCE" +AC_CHECK_TYPES([cpu_set_t], + [have_cpu_set_t="yes"], + [have_cpu_set_t="no"], + [#include ]) + +# Confirm that we have CPU_ZERO, and it actually works. +AC_MSG_CHECKING([whether CPU_ZERO works]) +AH_TEMPLATE([HAVE_CPU_ZERO], [Defined to 1 if we have CPU_ZERO and it works]) +AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #define _GNU_SOURCE + #include + int main() + { + cpu_set_t foo; CPU_ZERO(&foo); + return 0; + } + ]]) +],[ + AC_DEFINE(HAVE_CPU_ZERO, 1) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) + +# Confirm that we have CPU_SET, and it actually works. +AC_MSG_CHECKING([whether CPU_SET works]) +AH_TEMPLATE([HAVE_CPU_SET], [Defined to 1 if we have CPU_SET and it works]) +AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #define _GNU_SOURCE + #include + int main() + { + cpu_set_t foo, mask; CPU_SET(0, &foo); + return 0; + } + ]]) +],[ + AC_DEFINE(HAVE_CPU_SET, 1) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) + # First check if the function is available at all. AC_CHECK_FUNCS([sched_setaffinity],[ # Okay, we have it. Check if also have cpu_set_t. If we don't, @@ -195,27 +269,8 @@ AC_CHECK_FUNCS([sched_setaffinity],[ # version with 2 or 3 arguments. In that case, CPU_ZERO, etc., # should also be present, but we confirm nonetheless. - AC_CHECK_TYPES([cpu_set_t],[ - # We do have it. Confirm that we have CPU_ZERO, and it actually works. - AC_MSG_CHECKING([whether CPU_ZERO works]) - AH_TEMPLATE([HAVE_CPU_ZERO], [Defined to 1 if we have CPU_ZERO and it works]) - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #define _GNU_SOURCE - #include - int main() - { - cpu_set_t foo; CPU_ZERO (&foo); - return 0; - } - ]]) - ],[ - # Works! - AC_DEFINE(HAVE_CPU_ZERO, 1) - AC_MSG_RESULT([yes]) - ],[ - AC_MSG_RESULT([no]) - ]) - + AS_IF([test "x$have_cpu_set_t" = "xyes"], [ + # We do have it. # Check how many arguments does sched_setaffinity take. # Should be 3 or 2. AC_MSG_CHECKING([how many arguments sched_setaffinity takes]) @@ -224,21 +279,21 @@ AC_CHECK_FUNCS([sched_setaffinity],[ int main() { cpu_set_t foo; - sched_setaffinity (0, sizeof (foo), &foo); + sched_setaffinity(0, sizeof (foo), &foo); return 0; } ]]) ], [sched_set_affinity_args=3], [sched_set_affinity_args=2]) - AC_DEFINE_UNQUOTED(SCHED_SETAFFINITY_ARGS, $sched_set_affinity_args, + AC_DEFINE_UNQUOTED(SCHED_SETAFFINITY_ARGS, + $sched_set_affinity_args, [Defined to sched_setaffinity's number of arguments.]) AC_MSG_RESULT([$sched_set_affinity_args]) ],[ # No cpu_set_t, always 3 args. AC_DEFINE(SCHED_SETAFFINITY_ARGS, 3) - ], - [#include ]) + ]) ]) CFLAGS=$saved_CFLAGS @@ -250,7 +305,12 @@ AC_CONFIG_LINKS([ AC_CONFIG_FILES([ Makefile doc/Makefile + doc/examples/Makefile tests/Makefile + tests/common/Makefile + tests/unit/Makefile + tests/benchmark/Makefile + tests/regression/Makefile liburcu.pc liburcu-bp.pc liburcu-cds.pc