From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Fri, 4 Dec 2020 07:42:04 +0000 (+0100)
Subject: arm: Fix memchr() for Armv8-R
X-Git-Tag: newlib-4.1.0~9
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=6cc47c4c330a6468dd8a42b88f97c5aaecad3cdb;p=newlib-cygwin.git

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 <sebastian.huber@embedded-brains.de>
---

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