From 3deb46b503ab6829d06d9bee720614bf578113ca Mon Sep 17 00:00:00 2001
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
Date: Thu, 6 Dec 2018 15:28:25 +0000
Subject: evas - cpu - fix sve check when neon is disabled...

---
 src/lib/evas/common/evas_cpu.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/lib/evas/common/evas_cpu.c b/src/lib/evas/common/evas_cpu.c
index d9215e1140..d9f5c015ee 100644
--- a/src/lib/evas/common/evas_cpu.c
+++ b/src/lib/evas/common/evas_cpu.c
@@ -90,15 +90,6 @@ evas_common_cpu_neon_test(void)
 //#endif
 }
 
-void
-evas_common_cpu_sve_test(void)
-{
-#if defined(__aarch64__)
-   volatile int result = 123;
-   asm("movz %w[res], #10" : [res] "=r" (result));
-#endif
-}
-
 void
 evas_common_cpu_vis_test(void)
 {
@@ -130,6 +121,15 @@ _cpu_check(Eina_Cpu_Features f)
 }
 #endif
 
+#if defined(__aarch64__)
+void
+evas_common_cpu_sve_test(void)
+{
+   volatile int result = 123;
+   asm("movz %w[res], #10" : [res] "=r" (result));
+}
+#endif
+
 #ifdef NEED_FEATURE_TEST
 int
 evas_common_cpu_feature_test(void (*feature)(void))
@@ -274,15 +274,14 @@ evas_common_cpu_init(void)
      cpu_feature_mask &= ~CPU_FEATURE_SVE;
    else
      {
-#  if defined(HAVE_SYS_AUXV_H) && defined(HAVE_ASM_HWCAP_H) && defined(__arm__) && defined(__linux__)
-#error "xx"
+# if defined(HAVE_SYS_AUXV_H) && defined(HAVE_ASM_HWCAP_H) && defined(__arm__) && defined(__linux__)
         cpu_feature_mask |= CPU_FEATURE_SVE *
           !!(eina_cpu_features_get() & EINA_CPU_SVE);
-#  else
+# else
         cpu_feature_mask |= CPU_FEATURE_SVE *
           evas_common_cpu_feature_test(evas_common_cpu_sve_test);
         evas_common_cpu_end_opt();
-#  endif
+# endif
      }
 #endif
 }
-- 
cgit v1.2.1