--- efl-1.25.1/meson.build.orig	2020-12-18 00:13:14.839459510 +0100
+++ efl-1.25.1/meson.build	2020-12-18 00:14:11.742458141 +0100
@@ -177,20 +177,11 @@
     config_h.set10('BUILD_SSE3', true)
     native_arch_opt_c_args = [ '-msse3' ]
     message('x86 build - MMX + SSE3 enabled')
-  elif host_machine.cpu_family() == 'arm'
-    cpu_neon = true
-    config_h.set10('BUILD_NEON', true)
-    add_project_arguments('-mfpu=neon', language: 'c')
+  elif host_machine.cpu_family() == 'arm' or host_machine.cpu_family() == 'aarch64'
+    cpu_neon = false
+    add_project_arguments('-mfloat-abi=softfp', language: 'c')
     add_project_arguments('-ftree-vectorize', language: 'c')
-    message('ARM build - NEON enabled')
-  elif host_machine.cpu_family() == 'aarch64'
-    cpu_neon = true
-    cpu_neon_intrinsics = true
-    config_h.set10('BUILD_NEON', true)
-    config_h.set10('BUILD_NEON_INTRINSICS', true)
-    add_project_arguments('-ftree-vectorize', language: 'c')
-    native_arch_opt_c_args = [ '-ftree-vectorize' ]
-    message('ARM64 build - NEON + intrinsics enabled')
+    message('ARM build - NEON disabled')
   elif host_machine.cpu_family() == 'ppc' or host_machine.cpu_family() == 'ppc64'
     config_h.set10('BUILD_ALTIVEC', true)
     add_project_arguments('-ftree-vectorize', language: 'c')