commit c5cc727dd04d1a5df16487d30c81a6a2ff2f0e0e
author Dave Rodgman <dave.rodgman@arm.com> Fri Sep 15 11:41:17 2023 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Mon Oct 16 09:25:59 2023 +0100
tree 82ac3749a9965a9c08ddcfe245ffbb7400e2ee7d
parent a0f10da9d22abea8879af814d739632ed9d30d0a

Use new MBEDTLS_ARCH_IS_xxx macros

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>

library/common.h

diff --git a/library/common.h b/library/common.h
index fd2aecb..6c65084 100644
--- a/library/common.h
+++ b/library/common.h
@@ -194,8 +194,7 @@
         uint8x16_t x = veorq_u8(v1, v2);
         vst1q_u8(r + i, x);
     }
-#elif defined(__amd64__) || defined(__x86_64__) || \
-    defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
+#elif defined(MBEDTLS_ARCH_IS_X64) || defined(MBEDTLS_ARCH_IS_ARM64)
     /* This codepath probably only makes sense on architectures with 64-bit registers */
     for (; (i + 8) <= n; i += 8) {
         uint64_t x = mbedtls_get_unaligned_uint64(a + i) ^ mbedtls_get_unaligned_uint64(b + i);
@@ -234,8 +233,7 @@
 {
     size_t i = 0;
 #if defined(MBEDTLS_EFFICIENT_UNALIGNED_ACCESS)
-#if defined(__amd64__) || defined(__x86_64__) || \
-    defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
+#if defined(MBEDTLS_ARCH_IS_X64) || defined(MBEDTLS_ARCH_IS_ARM64)
     /* This codepath probably only makes sense on architectures with 64-bit registers */
     for (; (i + 8) <= n; i += 8) {
         uint64_t x = mbedtls_get_unaligned_uint64(a + i) ^ mbedtls_get_unaligned_uint64(b + i);