Merge branch 'master' into urcu/ht

Conflicts:
	Makefile.am

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

diff --cc Makefile.am
index 23260496660f21d857006ec1740ddddebd1daf70,0cde84acc6515a405062e62ea93f72b756ee66df..ff7f1bb01b3fd7d8e8f0f411de232e3cecff7be3
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -52,10 -56,13 +57,13 @@@ liburcu_mb_la_LIBADD = liburcu-common.l
  
  liburcu_signal_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
  liburcu_signal_la_CFLAGS = -DRCU_SIGNAL
- liburcu_signal_la_LIBADD = liburcu-cds.la
+ liburcu_signal_la_LIBADD = liburcu-common.la
  
  liburcu_bp_la_SOURCES = urcu-bp.c urcu-pointer.c $(COMPAT)
- liburcu_bp_la_LIBADD = liburcu-cds.la
+ liburcu_bp_la_LIBADD = liburcu-common.la
+ 
 -liburcu_cds_la_SOURCES = rculfqueue.c rculfstack.c $(COMPAT)
++liburcu_cds_la_SOURCES = rculfqueue.c rculfstack.c rculfhash.c $(COMPAT)
+ liburcu_cds_la_LIBADD = liburcu-common.la
  
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = liburcu-cds.pc liburcu.pc liburcu-bp.pc liburcu-qsbr.pc \

diff --cc tests/Makefile.am
index 3917cd824ca2179aec232a82876440332be53ccc,399fe9cad7ebac30df8de2f106ea45b6d463a741..d32088b8e2cade6aa5a79eb16feb715c6d6615f0
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -170,15 -170,11 +170,15 @@@ test_urcu_lfs_dynlink_SOURCES = test_ur
  test_urcu_lfs_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS)
  test_urcu_lfs_dynlink_LDADD = $(URCU_CDS_LIB)
  
- test_urcu_wfs_SOURCES = test_urcu_wfs.c $(COMPAT)
+ test_urcu_wfs_SOURCES = test_urcu_wfs.c $(URCU_COMMON_LIB)
  test_urcu_wfs_dynlink_SOURCES = test_urcu_wfs.c
  test_urcu_wfs_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS)
- test_urcu_wfs_dynlink_LDADD = $(URCU_CDS_LIB)
+ test_urcu_wfs_dynlink_LDADD = $(URCU_COMMON_LIB)
  
 +test_urcu_hash_SOURCES = test_urcu_hash.c $(COMPAT)
 +test_urcu_hash_CFLAGS = -DRCU_MEMBARRIER $(AM_CFLAGS)
 +test_urcu_hash_LDADD = $(URCU) $(URCU_CDS_LIB)
 +
  urcutorture.c: api.h
  
  check-am: