From: Mathieu Desnoyers Date: Sat, 3 Sep 2011 14:48:44 +0000 (-0400) Subject: Merge branch 'master' into urcu/ht X-Git-Tag: v0.7.0~43^2~191 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=92cfe223501f564d3bd726a6c580702daeef4198;p=urcu.git Merge branch 'master' into urcu/ht Conflicts: Makefile.am Signed-off-by: Mathieu Desnoyers --- 92cfe223501f564d3bd726a6c580702daeef4198 diff --cc Makefile.am index 2326049,0cde84a..ff7f1bb --- a/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 3917cd8,399fe9c..d32088b --- a/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: