aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-12-06 15:28:25 +0000
committerChristopher Michael <cp.michael@samsung.com>2018-12-06 12:06:18 -0500
commit3deb46b503ab6829d06d9bee720614bf578113ca (patch)
treef302886882e5835080f25d164d997ee5863ffe25
parentupdate po files (diff)
downloadefl-devs/devilhorns/elput.tar.gz
evas - cpu - fix sve check when neon is disabled...devs/devilhorns/elput
-rw-r--r--src/lib/evas/common/evas_cpu.c25
1 files 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
@@ -91,15 +91,6 @@ evas_common_cpu_neon_test(void)
}
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)
{
# ifdef __SPARC__
@@ -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
}