arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove Aarch32 and Aarch64 from CPU_QueryARMv7 

I believe some of the code may be generated differently. When testing CPU_ProbeARMv7 I had trouble compiling it on ARMv8.
pull/853/head
Jeffrey Walton 2019-05-20 23:09:57 -04:00
parent a9be7ced86
commit cc011d2e44
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cpu.cpp
View File

@ -575,10 +575,7 @@ extern bool CPU_ProbePMULL();
inline bool CPU_QueryARMv7() inline bool CPU_QueryARMv7()
{ {
#if defined(__aarch32__) || defined(__aarch64__) #if defined(__ANDROID__) && defined(__arm__)
// ARMv7 or above
return true;
#elif defined(__ANDROID__) && defined(__arm__)
if (((android_getCpuFamily() & ANDROID_CPU_FAMILY_ARM) != 0) && if (((android_getCpuFamily() & ANDROID_CPU_FAMILY_ARM) != 0) &&
((android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_ARMv7) != 0)) ((android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_ARMv7) != 0))
return true; return true;