__android__ → __ANDROID__

Also see https://stackoverflow.com/q/6374523/608639
pull/461/head
Jeffrey Walton 2017-08-07 12:18:39 -04:00
parent 42d91b76fc
commit a8cbfc52fc
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
5 changed files with 7 additions and 7 deletions

View File

@ -81,7 +81,7 @@ bool CPU_TryCRC32_ARMV8()
}
return result;
#else
# if defined(__android__)
# if defined(__ANDROID__)
if (android_getCpuFeatures() & ANDROID_CPU_ARM64_FEATURE_CRC32)
return true;
// https://sourceware.org/ml/libc-help/2017-08/msg00012.html

View File

@ -214,7 +214,7 @@ bool CPU_TryPMULL_ARMV8()
}
return result;
# else
# if defined(__android__)
# if defined(__ANDROID__)
if (android_getCpuFeatures() & ANDROID_CPU_ARM64_FEATURE_PMULL)
return true;
// https://sourceware.org/ml/libc-help/2017-08/msg00012.html

View File

@ -73,10 +73,10 @@ bool CPU_TryNEON_ARM()
}
return result;
# else
# if defined(__android__) && (CRYPTOPP_BOOL_ARM64)
# if defined(__ANDROID__) && (CRYPTOPP_BOOL_ARM64)
if (android_getCpuFeatures() & ANDROID_CPU_ARM64_FEATURE_ASIMD)
return true;
# elif defined(__android__) && (CRYPTOPP_BOOL_ARM32)
# elif defined(__ANDROID__) && (CRYPTOPP_BOOL_ARM32)
if (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON)
return true;
# elif defined(__linux__) && defined(__aarch64__)

View File

@ -104,7 +104,7 @@ bool CPU_TryAES_ARMV8()
}
return result;
# else
# if defined(__android__)
# if defined(__ANDROID__)
if (android_getCpuFeatures() & ANDROID_CPU_ARM64_FEATURE_AES)
return true;
// https://sourceware.org/ml/libc-help/2017-08/msg00012.html

View File

@ -91,7 +91,7 @@ bool CPU_TrySHA1_ARMV8()
}
return result;
# else
# if defined(__android__)
# if defined(__ANDROID__)
if (android_getCpuFeatures() & ANDROID_CPU_ARM64_FEATURE_SHA1)
return true;
// https://sourceware.org/ml/libc-help/2017-08/msg00012.html
@ -161,7 +161,7 @@ bool CPU_TrySHA2_ARMV8()
}
return result;
#else
# if defined(__android__)
# if defined(__ANDROID__)
if (android_getCpuFeatures() & ANDROID_CPU_ARM64_FEATURE_SHA2)
return true;
// https://sourceware.org/ml/libc-help/2017-08/msg00012.html