From 4cc9153df2a4eff176a9fd3d1040d1c984497265 Mon Sep 17 00:00:00 2001
From: Sylvain Becker <[EMAIL REDACTED]>
Date: Thu, 13 Nov 2025 18:12:07 +0100
Subject: [PATCH] =?UTF-8?q?Android:=20remove=20old=20cpu-feature=20code,?=
=?UTF-8?q?=20and=20fix=20build=20(add=20HAVE=5FGETAUXV=E2=80=A6=20(#14460?=
=?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/cpuinfo/SDL_cpuinfo.c | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/src/cpuinfo/SDL_cpuinfo.c b/src/cpuinfo/SDL_cpuinfo.c
index 2692d19fe56d8..27483fbc69045 100644
--- a/src/cpuinfo/SDL_cpuinfo.c
+++ b/src/cpuinfo/SDL_cpuinfo.c
@@ -76,7 +76,7 @@
#include <sys/param.h>
#endif
-#if defined(HAVE_GETAUXVAL) || defined(HAVE_ELF_AUX_INFO)
+#if defined(HAVE_GETAUXVAL) || defined(HAVE_ELF_AUX_INFO) || defined(SDL_PLATFORM_ANDROID)
#include <sys/auxv.h>
#endif
@@ -488,22 +488,10 @@ static int CPU_haveNEON(void)
return 0;
}
return (hasneon & HWCAP_NEON) == HWCAP_NEON;
-#elif (defined(SDL_PLATFORM_LINUX) || defined(SDL_PLATFORM_ANDROID)) && defined(HAVE_GETAUXVAL)
+#elif (defined(SDL_PLATFORM_LINUX) && defined(HAVE_GETAUXVAL)) || defined(SDL_PLATFORM_ANDROID)
return (getauxval(AT_HWCAP) & HWCAP_NEON) == HWCAP_NEON;
#elif defined(SDL_PLATFORM_LINUX)
return readProcAuxvForNeon();
-#elif defined(SDL_PLATFORM_ANDROID)
- // Use NDK cpufeatures to read either /proc/self/auxv or /proc/cpuinfo
- {
- AndroidCpuFamily cpu_family = android_getCpuFamily();
- if (cpu_family == ANDROID_CPU_FAMILY_ARM) {
- uint64_t cpu_features = android_getCpuFeatures();
- if (cpu_features & ANDROID_CPU_ARM_FEATURE_NEON) {
- return 1;
- }
- }
- return 0;
- }
#elif defined(SDL_PLATFORM_RISCOS)
// Use the VFPSupport_Features SWI to access the MVFR registers
{