From cc011d2e4479ae53f951eeafb1d43128edfd6301 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Mon, 20 May 2019 23:09:57 -0400 Subject: [PATCH] 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. --- cpu.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cpu.cpp b/cpu.cpp index 9fc0e50c..ed088c58 100644 --- a/cpu.cpp +++ b/cpu.cpp @@ -575,10 +575,7 @@ extern bool CPU_ProbePMULL(); inline bool CPU_QueryARMv7() { -#if defined(__aarch32__) || defined(__aarch64__) - // ARMv7 or above - return true; -#elif defined(__ANDROID__) && defined(__arm__) +#if defined(__ANDROID__) && defined(__arm__) if (((android_getCpuFamily() & ANDROID_CPU_FAMILY_ARM) != 0) && ((android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_ARMv7) != 0)) return true;