[lttng-dev] [PATCH urcu 1/4] Cleanup: Move ARM specific code to urcu/arch/arm.h

[Mathieu Desnoyers]

Merged in liburcu master, thanks!

Mathieu

----- On Dec 15, 2020, at 11:28 AM, Michael Jeanson mjeanson at efficios.com wrote:

> Change-Id: I3e17308c5ae985789a2ac8361e9c9e958ff7d656
> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> ---
> include/urcu/arch/arm.h | 13 +++++++++++++
> include/urcu/compiler.h | 13 -------------
> 2 files changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/include/urcu/arch/arm.h b/include/urcu/arch/arm.h
> index cb8f28d..5d1c608 100644
> --- a/include/urcu/arch/arm.h
> +++ b/include/urcu/arch/arm.h
> @@ -57,6 +57,19 @@ extern "C" {
> #define __NR_membarrier		389
> #endif
> 
> +/*
> + * Error out for compilers with known bugs.
> + */
> +
> +/*
> + * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58854
> + */
> +#ifdef URCU_GCC_VERSION
> +# if URCU_GCC_VERSION >= 40800 && URCU_GCC_VERSION <= 40802
> +#  error Your gcc version produces clobbered frame accesses
> +# endif
> +#endif
> +
> #ifdef __cplusplus
> }
> #endif
> diff --git a/include/urcu/compiler.h b/include/urcu/compiler.h
> index 511dbdf..4806ee3 100644
> --- a/include/urcu/compiler.h
> +++ b/include/urcu/compiler.h
> @@ -108,23 +108,10 @@
> 
> #define CAA_ARRAY_SIZE(x)	(sizeof(x) / sizeof((x)[0]))
> 
> -/*
> - * Don't allow compiling with buggy compiler.
> - */
> -
> #ifdef __GNUC__
> # define URCU_GCC_VERSION	(__GNUC__ * 10000 \
> 				+ __GNUC_MINOR__ * 100 \
> 				+ __GNUC_PATCHLEVEL__)
> -
> -/*
> - * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58854
> - */
> -# ifdef __ARMEL__
> -#  if URCU_GCC_VERSION >= 40800 && URCU_GCC_VERSION <= 40802
> -#   error Your gcc version produces clobbered frame accesses
> -#  endif
> -# endif
> #endif
> 
> #endif /* _URCU_COMPILER_H */
> --
> 2.29.2

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com