From c45c262d2c55b59a6aab8396ce69d76e14dac843 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Mon, 7 Aug 2017 13:43:40 -0400 Subject: [PATCH] Update Android defines --- neon.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neon.cpp b/neon.cpp index 8c901724..99c5c6b5 100644 --- a/neon.cpp +++ b/neon.cpp @@ -73,10 +73,10 @@ bool CPU_TryNEON_ARM() } return result; # else -# if defined(__ANDROID__) && (CRYPTOPP_BOOL_ARM64) +# if defined(__ANDROID__) && (defined(__aarch32__) || defined(__aarch64__)) if (android_getCpuFeatures() & ANDROID_CPU_ARM64_FEATURE_ASIMD) return true; -# elif defined(__ANDROID__) && (CRYPTOPP_BOOL_ARM32) +# elif defined(__ANDROID__) && defined(__arm__) if (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) return true; # elif defined(__linux__) && defined(__aarch64__)