From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Sun, 4 Mar 2012 20:20:58 +0000 (-0500)
Subject: Merge branch 'urcu/ht-shrink'
X-Git-Tag: v0.7.0~43
X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=commitdiff_plain;h=aee1715b914e5f4ba5003079d5d954ef2209f04e;hp=df55172add00a2b1b33b6c09f1f83f858d452f89

Merge branch 'urcu/ht-shrink'
---

diff --git a/Makefile.am b/Makefile.am
index 3cfa0ef..a24cf60 100644
--- 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 f18d95b..5b4322b 100644
--- 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 5e9b059..35096a6 100644
--- 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>