From 5e15b462345708a00e8bbd243a78a420ef258c35 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Tue, 21 May 2019 08:13:52 -0400
Subject: [PATCH] Fix Aarch64 compile in CPU_ProbeARMv7 Previous to the
 Cryptogams cut-in we could be sloppy and return anything for ARMv8. Now e
 have real code backing ARMv7 we need to return an accurate value.

---
 neon_simd.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/neon_simd.cpp b/neon_simd.cpp
index 3b75f2e7..2518bdd7 100644
--- a/neon_simd.cpp
+++ b/neon_simd.cpp
@@ -50,7 +50,9 @@ extern "C" {
 
 bool CPU_ProbeARMv7()
 {
-#if defined(CRYPTOPP_NO_CPU_FEATURE_PROBES)
+#if defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM64)
+    return false;
+#elif defined(CRYPTOPP_NO_CPU_FEATURE_PROBES)
     return false;
 #elif CRYPTOPP_ARM_NEON_AVAILABLE
 # if defined(CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY)