From b937dbf2577e0fa3018c562312da7b08bbe72d70 Mon Sep 17 00:00:00 2001 From: Martin Sebor Date: Wed, 21 Jul 2021 10:48:55 -0600 Subject: [PATCH] Adjust macro to avoid warning [PR101379]. Resolves: PR bootstrap/101379 - libatomic arm build failure after r12-2132 due to -Warray-bounds on a constant address libatomic/ChangeLog: PR bootstrap/101379 * config/linux/arm/host-config.h (__kernel_helper_version): New function. Adjust shadow macro. --- libatomic/config/linux/arm/host-config.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libatomic/config/linux/arm/host-config.h b/libatomic/config/linux/arm/host-config.h index 1520f23..777d08a 100644 --- a/libatomic/config/linux/arm/host-config.h +++ b/libatomic/config/linux/arm/host-config.h @@ -39,8 +39,14 @@ typedef void (__kernel_dmb_t) (void); #define __kernel_dmb (*(__kernel_dmb_t *) 0xffff0fa0) /* Kernel helper page version number. */ -#define __kernel_helper_version (*(unsigned int *)0xffff0ffc) +static inline unsigned* +__kernel_helper_version () +{ + unsigned *volatile addr = (unsigned int *)0xffff0ffc; + return addr; +} +#define __kernel_helper_version (*__kernel_helper_version()) #ifndef HAVE_STREX static inline bool -- 2.7.4