commit 6eee57bc07632e4b915b64f1cc683d80c4010fdd
author Dave Rodgman <dave.rodgman@arm.com> Thu Nov 30 11:01:04 2023 +0000
committer Dave Rodgman <dave.rodgman@arm.com> Thu Nov 30 11:01:50 2023 +0000
tree 25a90ba89d8bff5c9bac600aa1bc7b6e5a151584
parent 12d1c3ad4fe58f056af1d332e4f0cc9cc672eca0
parent 10dfe76425a8088a67c5344f4f9f793891fec8ec

Merge remote-tracking branch 'origin/development' into msft-aarch64

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

library/aesce.h

diff --git a/library/aesce.h b/library/aesce.h
index 6b64f45..a14d085 100644
--- a/library/aesce.h
+++ b/library/aesce.h
@@ -20,9 +20,13 @@
 #include "mbedtls/aes.h"
 
 
-#if defined(MBEDTLS_AESCE_C) && defined(MBEDTLS_ARCH_IS_ARMV8_A) && \
-    defined(MBEDTLS_HAVE_NEON_INTRINSICS)
+#if defined(MBEDTLS_AESCE_C) \
+    && defined(MBEDTLS_ARCH_IS_ARMV8_A) && defined(MBEDTLS_HAVE_NEON_INTRINSICS) \
+    && (defined(MBEDTLS_COMPILER_IS_GCC) || defined(__clang__) || defined(MSC_VER))
 
+/* MBEDTLS_AESCE_HAVE_CODE is defined if we have a suitable target platform, and a
+ * potentially suitable compiler (compiler version & flags are not checked when defining
+ * this). */
 #define MBEDTLS_AESCE_HAVE_CODE
 
 #ifdef __cplusplus
@@ -123,9 +127,10 @@
 #else
 
 #if defined(MBEDTLS_AES_USE_HARDWARE_ONLY) && defined(MBEDTLS_ARCH_IS_ARMV8_A)
-#error "AES hardware acceleration not supported on this platform"
+#error "AES hardware acceleration not supported on this platform / compiler"
 #endif
 
-#endif /* MBEDTLS_AESCE_C && MBEDTLS_ARCH_IS_ARMV8_A && MBEDTLS_HAVE_NEON_INTRINSICS */
+#endif /* MBEDTLS_AESCE_C && MBEDTLS_ARCH_IS_ARMV8_A && MBEDTLS_HAVE_NEON_INTRINSICS &&
+          (MBEDTLS_COMPILER_IS_GCC || __clang__ || MSC_VER) */
 
 #endif /* MBEDTLS_AESCE_H */