X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Furcu%2Fcompiler.h;h=48211293417131c6ff73d0d107de84c4284d9589;hb=72d24c88ee075c8368fe57ee7e8fc66d99ce7e39;hp=09953f2c2b96eeb5dfd27e04b43825a717d1e38c;hpb=4b3a7ebd5597b5e241c39110eb426f7832066308;p=userspace-rcu.git

diff --git a/include/urcu/compiler.h b/include/urcu/compiler.h
index 09953f2..4821129 100644
--- a/include/urcu/compiler.h
+++ b/include/urcu/compiler.h
@@ -1,22 +1,12 @@
+// SPDX-FileCopyrightText: 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+//
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
 #ifndef _URCU_COMPILER_H
 #define _URCU_COMPILER_H
 
 /*
- * compiler.h
- *
  * Compiler definitions.
- *
- * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
  */
 
 #include <stddef.h>	/* for offsetof */
@@ -25,10 +15,16 @@
 # include <type_traits>	/* for std::remove_cv */
 #endif
 
+#include <urcu/config.h>
+
 #define caa_likely(x)	__builtin_expect(!!(x), 1)
 #define caa_unlikely(x)	__builtin_expect(!!(x), 0)
 
-#define	cmm_barrier()	__asm__ __volatile__ ("" : : : "memory")
+#ifdef CONFIG_RCU_USE_ATOMIC_BUILTINS
+#  define cmm_barrier() __atomic_signal_fence(__ATOMIC_SEQ_CST)
+#else
+#  define cmm_barrier() __asm__ __volatile__ ("" : : : "memory")
+#endif
 
 /*
  * Instruct the compiler to perform only a single access to a variable
@@ -140,30 +136,4 @@
 				+ __GNUC_PATCHLEVEL__)
 #endif
 
-#ifdef __cplusplus
-#define caa_unqual_scalar_typeof(x)					\
-	std::remove_cv<std::remove_reference<decltype(x)>::type>::type
-#else
-#define caa_scalar_type_to_expr(type)					\
-	unsigned type: (unsigned type)0,				\
-	signed type: (signed type)0
-
-/*
- * Use C11 _Generic to express unqualified type from expression. This removes
- * volatile qualifier from expression type.
- */
-#define caa_unqual_scalar_typeof(x)					\
-	__typeof__(							\
-		_Generic((x),						\
-			char: (char)0,					\
-			caa_scalar_type_to_expr(char),			\
-			caa_scalar_type_to_expr(short),		\
-			caa_scalar_type_to_expr(int),			\
-			caa_scalar_type_to_expr(long),			\
-			caa_scalar_type_to_expr(long long),		\
-			default: (x)					\
-		)							\
-	)
-#endif
-
 #endif /* _URCU_COMPILER_H */