Merge branch 'urcu/ht-shrink'

diff --git a/Makefile.am b/Makefile.am
index 3cfa0ef66ff1b7de98c2ebcafce354aee6d2ba3b..a24cf60671e258e7bc62b5366f1cc554fb119979 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,3 +75,5 @@ liburcu_cds_la_LIBADD = liburcu-common.la
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = liburcu-cds.pc liburcu.pc liburcu-bp.pc liburcu-qsbr.pc \
        liburcu-signal.pc liburcu-mb.pc
+
+dist_doc_DATA = README ChangeLog

diff --git a/configure.ac b/configure.ac
index f18d95b7fa5ce4d7db8eced08e9d71af5bbf812f..5b4322bab2c9c184b5c5e87ac12df82807382b8a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -78,7 +78,14 @@ AS_IF([test "$host_cpu" = "armv7l"],[
 # ARM-specific checks
 AS_IF([test "x$ARCHTYPE" = "xarm"],[
        AC_MSG_CHECKING([for dmb instruction])
-       AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]], [[asm volatile("dmb":::"memory");]])],[
+       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])
        ],[
@@ -102,12 +109,12 @@ AS_IF([test "x$ARCHTYPE" = "xx86"],[
 
 # Check if sys_futex() is available
 AC_MSG_CHECKING([for sys_futex()])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
                #include <sys/syscall.h>
                #ifndef __NR_futex
                #error "futexes not available"
                #endif
-       ])
+       ]])
 ],[
        AC_MSG_RESULT([yes])
        AC_DEFINE([CONFIG_RCU_HAVE_FUTEX], [1])
@@ -175,8 +182,11 @@ AC_CHECK_FUNCS([sched_setaffinity],[
                AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
                                #define _GNU_SOURCE
                                #include <sched.h>
-                       ]],[[
-                               cpu_set_t foo; CPU_ZERO (&foo);
+                               int main()
+                               {
+                                       cpu_set_t foo; CPU_ZERO (&foo);
+                                       return 0;
+                               }
                        ]])
                ],[
                        # Works!
@@ -191,9 +201,12 @@ AC_CHECK_FUNCS([sched_setaffinity],[
                AC_MSG_CHECKING([how many arguments sched_setaffinity takes])
                AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
                                #include <sched.h>
-                       ]],[[
-                               cpu_set_t foo;
-                               sched_setaffinity (0, sizeof (foo), &foo);
+                               int main()
+                               {
+                                       cpu_set_t foo;
+                                       sched_setaffinity (0, sizeof (foo), &foo);
+                                       return 0;
+                               }
                        ]])
                ],
                [sched_set_affinity_args=3],

diff --git a/tests/urcutorture.c b/tests/urcutorture.c
index 5e9b0596fc1570a1b909d78687cb8c36c10419ce..35096a63f5843c38cbb68e3f87ed3f9b0210a5f2 100644 (file)
--- a/tests/urcutorture.c
+++ b/tests/urcutorture.c
@@ -1,3 +1,4 @@
+#define _GNU_SOURCE
 #include <string.h>
 #include <sys/time.h>
 #include <poll.h>