From 7d5ad8e77e4e085d30debc832d401d1cd78fb8c3 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Mon, 16 Sep 2019 11:26:24 +0000 Subject: [PATCH] util: skip NEON detection if built with -mfpu=neon Helps platforms where runtime detection isn't implemented. Reviewed-by: Matt Turner Signed-off-by: Jan Beich --- src/util/u_cpu_detect.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/u_cpu_detect.c b/src/util/u_cpu_detect.c index abfea65b24d..387003d6cba 100644 --- a/src/util/u_cpu_detect.c +++ b/src/util/u_cpu_detect.c @@ -360,7 +360,9 @@ check_os_arm_support(void) * used. Because of this we cannot use PIPE_OS_ANDROID here, but rather * have a separate macro that only gets enabled from respective Android.mk. */ -#if defined(HAS_ANDROID_CPUFEATURES) +#if defined(__ARM_NEON) || defined(__ARM_NEON__) + util_cpu_caps.has_neon = 1; +#elif defined(HAS_ANDROID_CPUFEATURES) AndroidCpuFamily cpu_family = android_getCpuFamily(); uint64_t cpu_features = android_getCpuFeatures(); -- 2.30.2