From f62b1533d570b867a817c5361b9d205f616fb2be Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 24 Jan 2020 17:52:55 -0700
Subject: [PATCH 2/2] disable arm neon

---
 coreconf/config.gypi  | 1 +
 lib/freebl/freebl.gyp | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/coreconf/config.gypi b/coreconf/config.gypi
index c07a59ab2..28fd8cd48 100644
--- a/coreconf/config.gypi
+++ b/coreconf/config.gypi
@@ -97,6 +97,7 @@
     'cc_use_gnu_ld%': '<(cc_use_gnu_ld)',
     # Some defaults
     'disable_arm_hw_aes%': 0,
+    'disable_arm_neon%': 0,
     'disable_tests%': 0,
     'disable_chachapoly%': 0,
     'disable_dbm%': 1,
diff --git a/lib/freebl/freebl.gyp b/lib/freebl/freebl.gyp
index d01531ad1..4835dcc60 100644
--- a/lib/freebl/freebl.gyp
+++ b/lib/freebl/freebl.gyp
@@ -101,7 +101,7 @@
             ],
           },
         }],
-        [ 'target_arch=="arm"', {
+        [ 'disable_arm_neon==0 and target_arch=="arm"', {
           # Gecko doesn't support non-NEON platform on Android, but tier-3
           # platform such as Linux/arm will need it
           'cflags_mozilla': [
@@ -264,7 +264,7 @@
             'armv8_c_lib'
           ],
         }],
-        [ 'target_arch=="arm"', {
+        [ 'disable_arm_neon==0 and target_arch=="arm"', {
           'dependencies': [
             'gcm-aes-arm32-neon_c_lib',
           ],
@@ -315,12 +315,12 @@
           'dependencies': [
             'gcm-aes-x86_c_lib',
           ]
-        }, 'target_arch=="arm" or target_arch=="arm64" or target_arch=="aarch64"', {
+        }, 'disable_arm_hw_aes==0 and (target_arch=="arm" or target_arch=="arm64" or target_arch=="aarch64")', {
           'dependencies': [
             'armv8_c_lib',
           ],
         }],
-        [ 'target_arch=="arm"', {
+        [ 'disable_arm_neon==0 and target_arch=="arm"', {
           'dependencies': [
             'gcm-aes-arm32-neon_c_lib',
           ],
-- 
2.24.1