From a79198c25140bf392cfca5e5cc1eb90344a56b48 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 4 Dec 2020 08:42:04 +0100 Subject: [PATCH] arm: Fix memchr() for Armv8-R The Cortex-R52 processor is an Armv8-R processor with a NEON unit. This fix prevents conflicting architecture profiles A/R errors issued by the linker. Signed-off-by: Sebastian Huber --- newlib/libc/machine/arm/memchr.S | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/newlib/libc/machine/arm/memchr.S b/newlib/libc/machine/arm/memchr.S index 7c22b117e..1a4c6512c 100644 --- a/newlib/libc/machine/arm/memchr.S +++ b/newlib/libc/machine/arm/memchr.S @@ -79,7 +79,11 @@ @ NOTE: This ifdef MUST match the one in memchr-stub.c #if defined (__ARM_NEON__) || defined (__ARM_NEON) +#if __ARM_ARCH >= 8 && __ARM_ARCH_PROFILE == 'R' + .arch armv8-r +#else .arch armv7-a +#endif .fpu neon