diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2021-03-09 09:53:27 -0500 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2021-03-09 09:53:27 -0500 |
| commit | d67a43949948d1038245b1e8378b15a10d4dccfd (patch) | |
| tree | 07e1c2057bb1d68ffcd803ada35707d5940884c6 /config_asm.h | |
| parent | 130d9385d6a8e33ab530e2be712448e071b1ada9 (diff) | |
| download | cryptopp-git-d67a43949948d1038245b1e8378b15a10d4dccfd.tar.gz | |
Remove old Android workarounds from config_asm.h (GH #1015)
Diffstat (limited to 'config_asm.h')
| -rw-r--r-- | config_asm.h | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/config_asm.h b/config_asm.h index 4ba48ea9..6a5db833 100644 --- a/config_asm.h +++ b/config_asm.h @@ -196,31 +196,6 @@ #define CRYPTOPP_PADLOCK_PMM_AVAILABLE 1
#endif
-// Fixup Android and SSE, Crypto. It may be enabled based on compiler version.
-// Also see https://developer.android.com/ndk/guides/abis
-#if defined(__ANDROID__) || defined(ANDROID)
-# if (CRYPTOPP_BOOL_X86)
-# undef CRYPTOPP_SSE41_AVAILABLE
-# undef CRYPTOPP_SSE42_AVAILABLE
-# undef CRYPTOPP_CLMUL_AVAILABLE
-# undef CRYPTOPP_AESNI_AVAILABLE
-# undef CRYPTOPP_SHANI_AVAILABLE
-# undef CRYPTOPP_RDRAND_AVAILABLE
-# undef CRYPTOPP_RDSEED_AVAILABLE
-# undef CRYPTOPP_AVX_AVAILABLE
-# undef CRYPTOPP_AVX2_AVAILABLE
-# endif
-# if (CRYPTOPP_BOOL_X64)
-# undef CRYPTOPP_CLMUL_AVAILABLE
-# undef CRYPTOPP_AESNI_AVAILABLE
-# undef CRYPTOPP_SHANI_AVAILABLE
-# undef CRYPTOPP_RDRAND_AVAILABLE
-# undef CRYPTOPP_RDSEED_AVAILABLE
-# undef CRYPTOPP_AVX_AVAILABLE
-# undef CRYPTOPP_AVX2_AVAILABLE
-# endif
-#endif
-
// Fixup for SunCC 12.1-12.4. Bad code generation in AES_Encrypt and friends.
#if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x5130)
# undef CRYPTOPP_AESNI_AVAILABLE
@@ -372,26 +347,6 @@ # undef CRYPTOPP_ARM_ACLE_HEADER
#endif
-// Android hack. TODO: look at this in more detail
-// now that Android has switched over to Clang.
-#if defined(__ANDROID__) || defined(ANDROID)
-# undef CRYPTOPP_ARM_ACLE_HEADER
-#endif
-
-// Disable for Android. Android only offers the base Aarch64 architecture.
-// Also see https://developer.android.com/ndk/guides/abis
-#if defined(__ANDROID__) || defined(ANDROID)
-# undef CRYPTOPP_ARM_CRC32_AVAILABLE
-# undef CRYPTOPP_ARM_PMULL_AVAILABLE
-# undef CRYPTOPP_ARM_AES_AVAILABLE
-# undef CRYPTOPP_ARM_SHA1_AVAILABLE
-# undef CRYPTOPP_ARM_SHA2_AVAILABLE
-# undef CRYPTOPP_ARM_SHA3_AVAILABLE
-# undef CRYPTOPP_ARM_SHA512_AVAILABLE
-# undef CRYPTOPP_ARM_SM3_AVAILABLE
-# undef CRYPTOPP_ARM_SM4_AVAILABLE
-#endif
-
// Cryptogams offers an ARM asm implementations for AES and SHA. Crypto++ does
// not provide an asm implementation. The Cryptogams AES implementation is
// about 50% faster than C/C++, and SHA implementation is about 30% faster
|