From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2134) id A92383861018; Mon, 14 Dec 2020 21:10:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A92383861018 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jeff Johnston To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] arm: Fix memchr() for Armv8-R X-Act-Checkin: newlib-cygwin X-Git-Author: Sebastian Huber X-Git-Refname: refs/heads/master X-Git-Oldrev: 8199b0cc38de3553d2e86f170d7da0b64405d10c X-Git-Newrev: 6cc47c4c330a6468dd8a42b88f97c5aaecad3cdb Message-Id: <20201214211042.A92383861018@sourceware.org> Date: Mon, 14 Dec 2020 21:10:42 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Dec 2020 21:10:42 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=6cc47c4c330a6468dd8a42b88f97c5aaecad3cdb commit 6cc47c4c330a6468dd8a42b88f97c5aaecad3cdb Author: Sebastian Huber Date: Fri Dec 4 08:42:04 2020 +0100 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 Diff: --- 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