From 98979f62b88dc781e99db84744646f298fcea62f Mon Sep 17 00:00:00 2001 From: Wilco Dijkstra Date: Wed, 15 Jul 2020 16:58:07 +0100 Subject: [PATCH] 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) --- 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 a6774f0d17d..18b5f515431 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 6f585b3758c..bc3f2e566d4 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 153d258afe9..c52ed7fc127 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 { -- 2.39.2