diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index e18e9a5fc..158070783 100644
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -865,9 +865,8 @@
 
 #endif
 
-#if defined(MBEDTLS_SHA256_USE_A64_CRYPTO_ONLY) && \
-    !defined(__aarch64__) && !defined(_M_ARM64)
-#error "MBEDTLS_SHA256_USE_A64_CRYPTO_ONLY defined on non-Aarch64 system"
+#if defined(MBEDTLS_SHA256_USE_A64_CRYPTO_ONLY) && !defined(MBEDTLS_ARCH_IS_ARMV8)
+#error "MBEDTLS_SHA256_USE_A64_CRYPTO_ONLY defined on non-Armv8 system"
 #endif
 
 /* TLS 1.3 requires separate HKDF parts from PSA,
diff --git a/library/sha256.c b/library/sha256.c
index 223badf00..83dcc8156 100644
--- a/library/sha256.c
+++ b/library/sha256.c
@@ -56,7 +56,7 @@
 
 #include "mbedtls/platform.h"
 
-#if defined(__aarch64__)
+#if defined(MBEDTLS_ARCH_IS_ARMV8)
 
 #  if defined(MBEDTLS_SHA256_USE_A64_CRYPTO_IF_PRESENT) || \
     defined(MBEDTLS_SHA256_USE_A64_CRYPTO_ONLY)