Merge branch 'master' into rbtree2

diff --combined Makefile.am
index c73dc40a3c8dfe4fb6a07ed6e8ef135ae3bb31e5,6378af48a551d641ad1623bb189d34d4be5207b9..a1609b34ca9d3f4537ae6a9b2e372822dce259df
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -14,8 -14,7 +14,8 @@@ nobase_dist_include_HEADERS = urcu/comp
                urcu/uatomic/generic.h urcu/arch/generic.h urcu/wfstack.h \
                urcu/wfqueue.h urcu/rculfstack.h urcu/rculfqueue.h \
                urcu/ref.h urcu/map/*.h urcu/static/*.h urcu/cds.h \
 -              urcu/urcu_ref.h urcu/urcu-futex.h urcu/uatomic_arch.h
 +              urcu/urcu_ref.h urcu/urcu-futex.h urcu/uatomic_arch.h \
 +              urcu/rcurbtree.h
  nobase_nodist_include_HEADERS = urcu/arch.h urcu/uatomic.h urcu/config.h
  
  EXTRA_DIST = $(top_srcdir)/urcu/arch/*.h $(top_srcdir)/urcu/uatomic/*.h \
@@@ -38,39 -37,31 +38,34 @@@ lib_LTLIBRARIES = liburcu-cds-common.l
                liburcu.la liburcu-qsbr.la \
                liburcu-mb.la liburcu-signal.la liburcu-bp.la \
                liburcu-cds.la liburcu-cds-qsbr.la \
 -              liburcu-cds-mb.la liburcu-cds-signal.la liburcu-cds-bp.la
 +              liburcu-cds-mb.la liburcu-cds-signal.la liburcu-cds-bp.la \
 +              liburcu-rbtree.la
  
  liburcu_cds_common_la_SOURCES = wfqueue.c wfstack.c $(COMPAT)
  
  liburcu_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
- liburcu_la_LIBADD = liburcu-cds-common.la
  liburcu_cds_la_SOURCES = rculfqueue.c rculfstack.c $(COMPAT)
  
  liburcu_qsbr_la_SOURCES = urcu-qsbr.c urcu-pointer.c $(COMPAT)
- liburcu_qsbr_la_LIBADD = liburcu-cds-common.la
  liburcu_cds_qsbr_la_SOURCES = rculfqueue.c rculfstack.c $(COMPAT)
  liburcu_cds_qsbr_la_CFLAGS = -DRCU_QSBR
  
  liburcu_mb_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
  liburcu_mb_la_CFLAGS = -DRCU_MB
- liburcu_mb_la_LIBADD = liburcu-cds-common.la
  liburcu_cds_mb_la_SOURCES = rculfqueue.c rculfstack.c $(COMPAT)
  liburcu_cds_mb_la_CFLAGS = -DRCU_MB
  
  liburcu_signal_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
  liburcu_signal_la_CFLAGS = -DRCU_SIGNAL
- liburcu_signal_la_LIBADD = liburcu-cds-common.la
  liburcu_cds_signal_la_SOURCES = rculfqueue.c rculfstack.c $(COMPAT)
  liburcu_cds_signal_la_CFLAGS = -DRCU_SIGNAL
  
  liburcu_bp_la_SOURCES = urcu-bp.c urcu-pointer.c $(COMPAT)
- liburcu_bp_la_LIBADD = liburcu-cds-common.la
  liburcu_cds_bp_la_SOURCES = rculfqueue.c rculfstack.c $(COMPAT)
  liburcu_cds_bp_la_CFLAGS = -DRCU_BP
  
 +liburcu_rbtree_la_SOURCES = urcu-rbtree.c $(COMPAT)
 +
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = liburcu-cds.pc liburcu.pc liburcu-bp.pc liburcu-qsbr.pc \
        liburcu-signal.pc liburcu-mb.pc