Merge branch 'master' into urcu/ht-shrink-help

Conflicts:
	urcu-qsbr.c

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --combined tests/Makefile.am
index 9e5940f749b8e335961785a556b4de1d1a2d8772,9f5fbb130bf4eea10e9fc6bb77ac0ae3bbe6cf45..7c638ed452c68e857705c62a213b0ae76f4de25c
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -15,7 -15,7 +15,7 @@@ noinst_PROGRAMS = test_urcu test_urcu_d
          test_urcu_bp test_urcu_bp_dynamic_link test_cycles_per_loop \
        test_urcu_lfq test_urcu_wfq test_urcu_lfs test_urcu_wfs \
        test_urcu_wfq_dynlink test_urcu_wfs_dynlink \
 -      test_urcu_lfq_dynlink test_urcu_lfs_dynlink
 +      test_urcu_lfq_dynlink test_urcu_lfs_dynlink test_urcu_hash
  noinst_HEADERS = rcutorture.h
  
  if COMPAT_ARCH
@@@ -165,8 -165,8 +165,8 @@@ test_urcu_wfq_dynlink_SOURCES = test_ur
  test_urcu_wfq_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS)
  test_urcu_wfq_dynlink_LDADD = $(URCU_COMMON_LIB)
  
- test_urcu_lfs_SOURCES = test_urcu_lfs.c $(URCU_CDS_LIB) $(URCU_DEFER)
- test_urcu_lfs_dynlink_SOURCES = test_urcu_lfs.c $(URCU_DEFER)
+ test_urcu_lfs_SOURCES = test_urcu_lfs.c $(URCU) $(URCU_CDS_LIB)
+ test_urcu_lfs_dynlink_SOURCES = test_urcu_lfs.c $(URCU)
  test_urcu_lfs_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS)
  test_urcu_lfs_dynlink_LDADD = $(URCU_CDS_LIB)
  
@@@ -175,10 -175,6 +175,10 @@@ test_urcu_wfs_dynlink_SOURCES = test_ur
  test_urcu_wfs_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS)
  test_urcu_wfs_dynlink_LDADD = $(URCU_COMMON_LIB)
  
 +test_urcu_hash_SOURCES = test_urcu_hash.c $(COMPAT)
 +test_urcu_hash_CFLAGS = -DRCU_QSBR $(AM_CFLAGS)
 +test_urcu_hash_LDADD = $(URCU_QSBR_LIB) $(URCU_CDS_LIB)
 +
  urcutorture.c: api.h
  
  check-am: