diff --git a/configure.ac b/configure.ac
index da0012a37..6db32752e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1686,8 +1686,6 @@ then
                 break;;
             esac
             ENABLED_ARMASM_SHA512=yes
-            AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ARMASM_CRYPTO_SHA512"
-            AM_CCASFLAGS="$AM_CCASFLAGS -DWOLFSSL_ARMASM_CRYPTO_SHA512"
             ;;
         *)
             AC_MSG_ERROR([Invalid choice of ARM asm inclusions (yes, sha512-crypto): $ENABLED_ARMASM.])
@@ -1707,6 +1705,8 @@ then
         *aarch64*)
             case $host_os in
             *darwin*)
+                # All known Aarch64 Mac computers support SHA-512 instructions
+                ENABLED_ARMASM_SHA512=yes
                 ;;
             *)
                 # +crypto needed for hardware acceleration
@@ -1741,6 +1741,11 @@ then
     esac
 fi
 
+if test "$ENABLED_ARMASM_SHA512" = "yes"; then
+    AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ARMASM_CRYPTO_SHA512"
+    AM_CCASFLAGS="$AM_CCASFLAGS -DWOLFSSL_ARMASM_CRYPTO_SHA512"
+fi
+
 # Xilinx hardened crypto
 AC_ARG_ENABLE([xilinx],
     [AS_HELP_STRING([--enable-xilinx],[Enable wolfSSL support for Xilinx hardened crypto(default: disabled)])],