Fix compiling with Android NDK.

This commit is contained in:
2021-10-24 04:25:47 +01:00
parent 1af5ae7d9f
commit 64ed30e13d
4 changed files with 47 additions and 38 deletions

View File

@@ -85,8 +85,10 @@ UInt32 MY_FAST_CALL CrcUpdateT1(UInt32 v, const void *data, size_t size, const U
|| (defined(__GNUC__) && (__GNUC__ > 4))
#if !defined(__ARM_FEATURE_CRC32)
#define __ARM_FEATURE_CRC32 1
#if (!defined(__clang__) || (__clang_major__ > 3)) // fix these numbers
#if !defined(__clang__)
#define ATTRIB_CRC __attribute__((__target__("arch=armv8-a+crc")))
#else
#define ATTRIB_CRC __attribute__((target("armv8-a,crc")))
#endif
#endif
#if defined(__ARM_FEATURE_CRC32)

View File

@@ -509,7 +509,7 @@ VAES_COMPAT_STUB (AesCtr_Code_HW)
#elif defined(MY_CPU_ARM_OR_ARM64) && defined(MY_CPU_LE)
#if defined(__clang__)
#if (__clang_major__ >= 8) // fix that check
#if (__clang_major__ >= 8) && !defined(__ANDROID__) // fix that version check, Android with clang12 doesn't work
#define USE_HW_AES
#endif
#elif defined(__GNUC__)

View File

@@ -215,7 +215,7 @@ void MY_FAST_CALL Sha256_UpdateBlocks_HW(UInt32 state[8], const Byte *data, size
#elif defined(MY_CPU_ARM_OR_ARM64)
#if defined(__clang__)
#if (__clang_major__ >= 8) // fix that check
#if (__clang_major__ >= 8) && !defined(__ANDROID__) // fix that version check, Android with clang12 doesn't work
#define USE_HW_SHA
#endif
#elif defined(__GNUC__)