Fix ARMv7

config.h

@@ -550,7 +550,7 @@ NAMESPACE_END
 // Microsoft plans to support ARM-64, but its not clear how to detect it.
 // TODO: Add MSC_VER and ARM-64 platform define when available
 #if !defined(CRYPTOPP_ARM_CRC32_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ASM)
-# if defined(__ARM_FEATURE_CRYPTO) || (CRYPTOPP_MSC_VERSION >= 2000) || \
+# if defined(__ARM_FEATURE_CRC32) || (CRYPTOPP_MSC_VERSION >= 2000) || \
 	(CRYPTOPP_GCC_VERSION >= 40800) || (CRYPTOPP_LLVM_CLANG_VERSION >= 30500)
 #  define CRYPTOPP_ARM_CRC32_AVAILABLE 1
 # endif

crc-simd.cpp

@@ -10,15 +10,18 @@
 #include "config.h"
 #include "misc.h"
 
+// Clang and GCC hoops...
+#if !(defined(__ARM_FEATURE_CRC32) || defined(__aarch32__) || defined(__aarch64__) || defined(_MSC_VER))
+# undef CRYPTOPP_ARM_CRC32_AVAILABLE
+#endif
+
 #if (CRYPTOPP_SSE42_AVAILABLE)
 # include "nmmintrin.h"
 #endif
 
-#if (CRYPTOPP_ARM_NEON_AVAILABLE)
+#if (CRYPTOPP_ARM_CRC32_AVAILABLE)
 # include "arm_neon.h"
-# if (CRYPTOPP_ARM_CRC32_AVAILABLE)
 # include "arm_acle.h"
-# endif
 #endif
 
 #ifdef CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY

gcm-simd.cpp

@@ -10,16 +10,19 @@
 #include "config.h"
 #include "misc.h"
 
+// Clang and GCC hoops...
+#if !(defined(__ARM_FEATURE_CRYPTO) || defined(__aarch32__) || defined(__aarch64__) || defined(_MSC_VER))
+# undef CRYPTOPP_ARM_PMULL_AVAILABLE
+#endif
+
 #if (CRYPTOPP_CLMUL_AVAILABLE)
 # include "tmmintrin.h"
 # include "wmmintrin.h"
 #endif
 
-#if (CRYPTOPP_ARM_NEON_AVAILABLE)
+#if (CRYPTOPP_ARM_PMULL_AVAILABLE)
 # include "arm_neon.h"
-# if (CRYPTOPP_ARM_PMULL_AVAILABLE)
 # include "arm_acle.h"
-# endif
 #endif
 
 #ifdef CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY

sha-simd.cpp

@@ -10,6 +10,11 @@
 #include "config.h"
 #include "misc.h"
 
+// Clang and GCC hoops...
+#if !(defined(__ARM_FEATURE_CRYPTO) || defined(__aarch32__) || defined(__aarch64__) || defined(_MSC_VER))
+# undef CRYPTOPP_ARM_SHA_AVAILABLE
+#endif
+
 #if (CRYPTOPP_SSE42_AVAILABLE)
 # include "nmmintrin.h"
 #endif