Disable sys_membarrier

[urcu.git] / urcu / map / urcu.h

diff --git a/urcu/map/urcu.h b/urcu/map/urcu.h
index b55e304afe60af9933992b3e6be11a3ba96ac7c2..3fae95fbdfafa6883b44ad1864cbfd85013321c5 100644 (file)
--- a/urcu/map/urcu.h
+++ b/urcu/map/urcu.h
@@ -35,6 +35,25 @@
 /* Mapping macros to allow multiple flavors in a single binary. */
 
 #if !defined(RCU_MEMBARRIER) && !defined(RCU_SIGNAL) && !defined(RCU_MB)
+#define RCU_MEMBARRIER
+#endif
+
+/*
+ * RCU_MEMBARRIER is only possibly available on Linux. Fallback to
+ * RCU_MB
+ * otherwise.
+ */
+#if !defined(__linux__) && defined(RCU_MEMBARRIER)
+#undef RCU_MEMBARRIER
+#define RCU_MB
+#endif
+
+/*
+ * The ABI of sys_membarrier changed after its original implementation.
+ * Disable it for now. Use RCU_MB flavor instead.
+ */
+#ifdef RCU_MEMBARRIER
+#undef RCU_MEMBARRIER
 #define RCU_MB
 #endif
 
@@ -70,6 +89,8 @@
 #define rcu_defer_barrier              rcu_defer_barrier_memb
 #define rcu_defer_barrier_thread       rcu_defer_barrier_thread_memb
 
+#define rcu_flavor                     rcu_flavor_memb
+
 #elif defined(RCU_SIGNAL)
 
 #define rcu_read_lock                  rcu_read_lock_sig
@@ -102,6 +123,8 @@
 #define rcu_defer_barrier              rcu_defer_barrier_sig
 #define rcu_defer_barrier_thread       rcu_defer_barrier_thread_sig
 
+#define rcu_flavor                     rcu_flavor_sig
+
 #elif defined(RCU_MB)
 
 #define rcu_read_lock                  rcu_read_lock_mb
@@ -134,6 +157,8 @@
 #define rcu_defer_barrier              rcu_defer_barrier_mb
 #define rcu_defer_barrier_thread       rcu_defer_barrier_thread_mb
 
+#define rcu_flavor                     rcu_flavor_mb
+
 #else
 
 #error "Undefined selection"