summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config_asm.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/config_asm.h b/config_asm.h
index a634e214..3f7f2306 100644
--- a/config_asm.h
+++ b/config_asm.h
@@ -371,12 +371,14 @@
// than C/C++. Define this to use the Cryptogams AES and SHA implementations
// on GNU Linux systems. When defined, Crypto++ will use aes_armv4.S,
// sha1_armv4.S and sha256_armv4.S. https://www.cryptopp.com/wiki/Cryptogams.
-#if defined(__arm__) && defined(__linux__)
-# if defined(__GNUC__) || defined(__clang__)
-# define CRYPTOGAMS_ARM_AES 1
-# define CRYPTOGAMS_ARM_SHA1 1
-# define CRYPTOGAMS_ARM_SHA256 1
-# define CRYPTOGAMS_ARM_SHA512 1
+#if !defined(CRYPTOPP_DISABLE_ARM_NEON)
+# if defined(__arm__) && defined(__linux__)
+# if defined(__GNUC__) || defined(__clang__)
+# define CRYPTOGAMS_ARM_AES 1
+# define CRYPTOGAMS_ARM_SHA1 1
+# define CRYPTOGAMS_ARM_SHA256 1
+# define CRYPTOGAMS_ARM_SHA512 1
+# endif
# endif
#endif