commit 3ba9ce3c1def3278791704fe40d6cc38be201c97
author Dave Rodgman <dave.rodgman@arm.com> Thu Oct 05 09:58:33 2023 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Thu Oct 05 09:58:33 2023 +0100
tree c3c1647764c19eb42d8e3479fc7e4fe05e53206f
parent cd65400c48ca10020f948c87f78cdd71fcc9a6a8

Warn if using runtime detection and no Neon

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

library/sha256.c

diff --git a/library/sha256.c b/library/sha256.c
index b603b86..8315b71 100644
--- a/library/sha256.c
+++ b/library/sha256.c
@@ -61,17 +61,24 @@
 
 #if defined(MBEDTLS_ARCH_IS_ARMV8)
 
-#  if defined(MBEDTLS_SHA256_USE_A64_CRYPTO_IF_PRESENT) || \
-    defined(MBEDTLS_SHA256_USE_A64_CRYPTO_ONLY)
-
 /* *INDENT-OFF* */
 
-#   ifdef __ARM_NEON
-#       include <arm_neon.h>
-#   else
-#       error "Target does not support NEON instructions"
+#  if defined(MBEDTLS_SHA256_USE_A64_CRYPTO_IF_PRESENT) || \
+    defined(MBEDTLS_SHA256_USE_A64_CRYPTO_ONLY)
+#       ifdef __ARM_NEON
+#           include <arm_neon.h>
+#       else
+#           if defined(MBEDTLS_SHA256_USE_A64_CRYPTO_IF_PRESENT)
+#               warning "Target does not support NEON instructions"
+#               undef MBEDTLS_SHA256_USE_A64_CRYPTO_IF_PRESENT
+#           else
+#               error "Target does not support NEON instructions"
+#           endif
+#       endif
 #   endif
 
+#  if defined(MBEDTLS_SHA256_USE_A64_CRYPTO_IF_PRESENT) || \
+    defined(MBEDTLS_SHA256_USE_A64_CRYPTO_ONLY)
 #   if !defined(__ARM_FEATURE_CRYPTO) || defined(MBEDTLS_ENABLE_ARM_CRYPTO_EXTENSIONS_COMPILER_FLAG)
 #      if defined(__ARMCOMPILER_VERSION)
 #        if __ARMCOMPILER_VERSION <= 6090000