diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2021-03-11 18:37:39 -0500 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2021-03-11 18:37:39 -0500 |
| commit | a157402f19bbee5068b0193255e474cd1978aa09 (patch) | |
| tree | 2f29c0ef26b9d9b69e53e56b68cd695d93eb4ab9 | |
| parent | 8f330750351134824710fe8381a62955bede78ef (diff) | |
| download | cryptopp-git-a157402f19bbee5068b0193255e474cd1978aa09.tar.gz | |
Fix grep expression in cryptest-ios.sh
| -rwxr-xr-x | TestScripts/cryptest-ios.sh | 2 | ||||
| -rw-r--r-- | config_asm.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/TestScripts/cryptest-ios.sh b/TestScripts/cryptest-ios.sh index 6bf21823..3076111d 100755 --- a/TestScripts/cryptest-ios.sh +++ b/TestScripts/cryptest-ios.sh @@ -122,7 +122,7 @@ do then # Test ASIMD code generation - count=$(otool -tV aria_simd.o 2>&1 | grep -c -E 'vld|vst|vshl|vshr|veor') + count=$(otool -tV aria_simd.o 2>&1 | grep -c -E 'ldr[[:space:]]*q|str[[:space:]]*q|shl.4|shr.4|eor.16') if [[ "${count}" -gt 64 ]] then echo "${platform} : ASIMD ==> SUCCESS" >> "${TMPDIR}/build.log" diff --git a/config_asm.h b/config_asm.h index 53f63480..6c231311 100644 --- a/config_asm.h +++ b/config_asm.h @@ -244,8 +244,8 @@ // Requires GCC 4.8, Clang 3.3 or Visual Studio 2017
// Do not use APPLE_CLANG_VERSION; use __ARM_FEATURE_XXX instead.
#if !defined(CRYPTOPP_ARM_ASIMD_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ARM_ASIMD)
-# if defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM64)
-# if defined(__ARM_NEON) || defined(__ARM_FEATURE_NEON) || defined(__ARM_FEATURE_ASIMD) || \
+# if defined(__aarch32__) || defined(__aarch64__) || defined(__arm64__) || defined(_M_ARM64)
+# if defined(__ARM_NEON) || defined(__ARM_ASIMD) || defined(__ARM_FEATURE_NEON) || defined(__ARM_FEATURE_ASIMD) || \
(CRYPTOPP_GCC_VERSION >= 40800) || (CRYPTOPP_LLVM_CLANG_VERSION >= 30300) || \
(CRYPTOPP_APPLE_CLANG_VERSION >= 40000) || (CRYPTOPP_MSC_VERSION >= 1916)
# define CRYPTOPP_ARM_NEON_AVAILABLE 1
|