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 <carlos@redhat.com>
(cherry picked from commit 0f6278a8793a5d04ea31878119eccf99f469a02d)

diff --git a/sysdeps/aarch64/multiarch/memcpy.c b/sysdeps/aarch64/multiarch/memcpy.c
index 5fa99dd02709d3646d03aa9a0fb772dd494b95b1..be23c1ef02a4825c3f5258f8831fc8eb413f6b4d 100644 (file)
--- 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 be389ebbdecb1df5c426377d9e046a7bee492016..e1194c1618d0527c091c93939cf2626e8850b5a7 100644 (file)
--- 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 6f8b35ff0939dc776fdfd7f0941a3834e1f60902..342e06eaf41c87f150eafd9945702a89d519d18b 100644 (file)
--- 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
 {