From 23cbe6d5c1076551540159ce617ad0680b02a029 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Mon, 4 Feb 2019 17:54:45 -0700
Subject: [PATCH] Rip out VC4 forced NEON

Breaks with distro-supplied CFLAGS.
---
 meson.build                         |  1 -
 src/broadcom/meson.build            |  5 +----
 src/gallium/drivers/vc4/meson.build | 11 -----------
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/meson.build b/meson.build
index 155db287796..ff703e8e631 100644
--- a/meson.build
+++ b/meson.build
@@ -1282,7 +1282,6 @@ elif host_machine.cpu_family() == 'x86_64'
 elif host_machine.cpu_family() == 'arm'
   if system_has_kms_drm
     with_asm_arch = 'arm'
-    pre_args += ['-DUSE_ARM_ASM']
   endif
 elif host_machine.cpu_family() == 'aarch64'
   if system_has_kms_drm
diff --git a/src/broadcom/meson.build b/src/broadcom/meson.build
index 2e1145dd0c0..c6266af9654 100644
--- a/src/broadcom/meson.build
+++ b/src/broadcom/meson.build
@@ -50,12 +50,9 @@ foreach ver : v3d_versions
   )
 endforeach
 
-v3d_args = ['-DV3D_BUILD_NEON']
+v3d_args = []
 
 v3d_neon_c_args = []
-if host_machine.cpu_family() == 'arm'
-    v3d_neon_c_args = '-mfpu=neon'
-endif
 
 libv3d_neon = static_library(
   'v3d_neon',
diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson.build
index 90a772d5dc6..3074933584c 100644
--- a/src/gallium/drivers/vc4/meson.build
+++ b/src/gallium/drivers/vc4/meson.build
@@ -84,17 +84,6 @@ files_libvc4 = files(
 vc4_c_args = []
 
 libvc4_neon = []
-if host_machine.cpu_family() == 'arm'
-  libvc4_neon = static_library(
-    'vc4_neon',
-    'vc4_tiling_lt_neon.c',
-    include_directories : [
-      inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom
-    ],
-    c_args : '-mfpu=neon',
-  )
-  vc4_c_args += '-DUSE_ARM_ASM'
-endif
 
 if dep_simpenrose.found()
   vc4_c_args += '-DUSE_VC4_SIMULATOR'
-- 
2.30.0