X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fcompiler.h;h=19534f08522ac3cc28a3557d93f7a16baab6e56e;hp=08bd9e9f44fa004a744f98d1734a5131bc670428;hb=4b5f005b03669c2942969e691fc3a0be47b15c57;hpb=3282a76b46b74a92809292fa63ba671de9ad88eb

diff --git a/urcu/compiler.h b/urcu/compiler.h
index 08bd9e9..19534f0 100644
--- a/urcu/compiler.h
+++ b/urcu/compiler.h
@@ -24,7 +24,7 @@
 #define caa_likely(x)	__builtin_expect(!!(x), 1)
 #define caa_unlikely(x)	__builtin_expect(!!(x), 0)
 
-#define	cmm_barrier()	asm volatile("" : : : "memory")
+#define	cmm_barrier()	__asm__ __volatile__ ("" : : : "memory")
 
 /*
  * Instruct the compiler to perform only a single access to a variable
@@ -38,7 +38,7 @@
  * use is to mediate communication between process-level code and irq/NMI
  * handlers, all running on the same CPU.
  */
-#define CMM_ACCESS_ONCE(x)	(*(volatile typeof(x) *)&(x))
+#define CMM_ACCESS_ONCE(x)	(*(__volatile__  __typeof__(x) *)&(x))
 
 #ifndef caa_max
 #define caa_max(a,b) ((a)>(b)?(a):(b))
@@ -65,12 +65,12 @@
  */
 #define caa_container_of(ptr, type, member)				\
 	({								\
-		const typeof(((type *) NULL)->member) * __ptr = (ptr);	\
+		const __typeof__(((type *) NULL)->member) * __ptr = (ptr); \
 		(type *)((char *)__ptr - offsetof(type, member));	\
 	})
 
 #define CAA_BUILD_BUG_ON_ZERO(cond) (sizeof(struct { int:-!!(cond); }))
-#define CAA_BUILD_BUG_ON(cond) ((void)BUILD_BUG_ON_ZERO(cond))
+#define CAA_BUILD_BUG_ON(cond) ((void)CAA_BUILD_BUG_ON_ZERO(cond))
 
 /*
  * __rcu is an annotation that documents RCU pointer accesses that need
@@ -86,4 +86,26 @@
 #define URCU_FORCE_CAST(type, arg)	((type) (arg))
 #endif
 
+#define caa_is_signed_type(type)	((type) -1 < (type) 0)
+
+/*
+ * Sign-extend to long if needed, and output type is unsigned long.
+ */
+#define caa_cast_long_keep_sign(v)		\
+	(caa_is_signed_type(__typeof__(v)) ?	\
+		(unsigned long) (long) (v) :	\
+		(unsigned long) (v))
+
+#if defined (__GNUC__) \
+	&& ((__GNUC_MAJOR__ == 4) && (__GNUC_MINOR__ >= 5)	\
+		|| __GNUC_MAJOR__ >= 5)
+#define CDS_DEPRECATED(msg)	\
+	__attribute__((deprecated(msg)))
+#else
+#define CDS_DEPRECATED(msg)	\
+	__attribute__((deprecated))
+#endif
+
+#define CAA_ARRAY_SIZE(x)	(sizeof(x) / sizeof((x)[0]))
+
 #endif /* _URCU_COMPILER_H */