From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1895) id C8AD43937421; Wed, 14 Oct 2020 16:26:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C8AD43937421 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Wilco Dijkstra To: glibc-cvs@sourceware.org Subject: [glibc/release/2.29/master] AArch64: Rename IS_ARES to IS_NEOVERSE_N1 X-Act-Checkin: glibc X-Git-Author: Wilco Dijkstra X-Git-Refname: refs/heads/release/2.29/master X-Git-Oldrev: 64458aabeb7f6d15b389cb49b9faf4925db354fa X-Git-Newrev: 53d501d6e952ada9b3a44baf857b9d7fba278efd Message-Id: <20201014162634.C8AD43937421@sourceware.org> Date: Wed, 14 Oct 2020 16:26:34 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Oct 2020 16:26:34 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=53d501d6e952ada9b3a44baf857b9d7fba278efd commit 53d501d6e952ada9b3a44baf857b9d7fba278efd Author: Wilco Dijkstra Date: Wed Jul 15 16:58:07 2020 +0100 AArch64: Rename IS_ARES to IS_NEOVERSE_N1 Rename IS_ARES to IS_NEOVERSE_N1 since that is a bit clearer. Reviewed-by: Carlos O'Donell (cherry picked from commit 0f6278a8793a5d04ea31878119eccf99f469a02d) Diff: --- sysdeps/aarch64/multiarch/memcpy.c | 4 +++- sysdeps/aarch64/multiarch/memmove.c | 4 +++- sysdeps/unix/sysv/linux/aarch64/cpu-features.h | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sysdeps/aarch64/multiarch/memcpy.c b/sysdeps/aarch64/multiarch/memcpy.c index 5fa99dd027..be23c1ef02 100644 --- a/sysdeps/aarch64/multiarch/memcpy.c +++ b/sysdeps/aarch64/multiarch/memcpy.c @@ -41,7 +41,9 @@ libc_ifunc (__libc_memcpy, ? __memcpy_falkor : (IS_THUNDERX2 (midr) || IS_THUNDERX2PA (midr) ? __memcpy_thunderx2 - : (IS_ARES (midr) ? __memcpy_simd : __memcpy_generic))))); + : (IS_NEOVERSE_N1 (midr) + ? __memcpy_simd + : __memcpy_generic))))); # undef memcpy strong_alias (__libc_memcpy, memcpy); diff --git a/sysdeps/aarch64/multiarch/memmove.c b/sysdeps/aarch64/multiarch/memmove.c index be389ebbde..e1194c1618 100644 --- a/sysdeps/aarch64/multiarch/memmove.c +++ b/sysdeps/aarch64/multiarch/memmove.c @@ -38,7 +38,9 @@ libc_ifunc (__libc_memmove, ? __memmove_thunderx : (IS_FALKOR (midr) || IS_PHECDA (midr) ? __memmove_falkor - : (IS_ARES (midr) ? __memmove_simd : __memmove_generic)))); + : (IS_NEOVERSE_N1 (midr) + ? __memmove_simd + : __memmove_generic)))); # undef memmove strong_alias (__libc_memmove, memmove); diff --git a/sysdeps/unix/sysv/linux/aarch64/cpu-features.h b/sysdeps/unix/sysv/linux/aarch64/cpu-features.h index 6f8b35ff09..342e06eaf4 100644 --- a/sysdeps/unix/sysv/linux/aarch64/cpu-features.h +++ b/sysdeps/unix/sysv/linux/aarch64/cpu-features.h @@ -51,8 +51,8 @@ #define IS_PHECDA(midr) (MIDR_IMPLEMENTOR(midr) == 'h' \ && MIDR_PARTNUM(midr) == 0x000) -#define IS_ARES(midr) (MIDR_IMPLEMENTOR(midr) == 'A' \ - && MIDR_PARTNUM(midr) == 0xd0c) +#define IS_NEOVERSE_N1(midr) (MIDR_IMPLEMENTOR(midr) == 'A' \ + && MIDR_PARTNUM(midr) == 0xd0c) struct cpu_features {