From 6f5de0a950ad28c7e270625895050311384eef74 Mon Sep 17 00:00:00 2001
From: František Zatloukal <fzatlouk@redhat.com>
Date: Sep 20 2021 18:37:31 +0000
Subject: Remove an upstreamed armv7 build fix


---

diff --git a/definitions_for_user_vfp.patch b/definitions_for_user_vfp.patch
deleted file mode 100644
index 066ed57..0000000
--- a/definitions_for_user_vfp.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From fd6847c9416f9eebde636e21d794d25d1be8791d Mon Sep 17 00:00:00 2001
-From: Mike Hommey <mh@glandium.org>
-Date: Sat, 1 Jun 2019 09:06:01 +0900
-Subject: [PATCH] Bug 1526653 - Include struct definitions for user_vfp and
- user_vfp_exc.
-
----
- js/src/wasm/WasmSignalHandlers.cpp | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
-index 37bc5a9..67b43ad 100644
---- a/js/src/wasm/WasmSignalHandlers.cpp
-+++ b/js/src/wasm/WasmSignalHandlers.cpp
-@@ -252,7 +252,16 @@ using mozilla::DebugOnly;
- #endif
-
- #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
--#  include <sys/user.h>
-+struct user_vfp {
-+  unsigned long long fpregs[32];
-+  unsigned long fpscr;
-+};
-+
-+struct user_vfp_exc {
-+  unsigned long fpexc;
-+  unsigned long fpinst;
-+  unsigned long fpinst2;
-+};
- #endif
-
- #if defined(ANDROID)
---
-2.31.1
-
diff --git a/mozjs91.spec b/mozjs91.spec
index a945c85..eb1b71c 100644
--- a/mozjs91.spec
+++ b/mozjs91.spec
@@ -44,9 +44,6 @@ Patch15:        remove-sloppy-m4-detection-from-bundled-autoconf.patch
 # TODO: Check with mozilla for cause of these fails and re-enable spidermonkey compile time checks if needed
 Patch16:        spidermonkey_checks_disable.patch
 
-# armv7 fixes
-Patch17:        definitions_for_user_vfp.patch
-
 # s390x/ppc64 fixes
 Patch19:        0001-Skip-failing-tests-on-ppc64-and-s390x.patch
 
@@ -99,12 +96,6 @@ pushd ../..
 %patch15 -p1
 %patch16 -p1
 
-%ifarch armv7hl
-# Include definitions for user vfp on armv7 as it causes the compilation to fail without them
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1526653
-%patch17 -p1
-%endif
-
 # Fixes for ppc64 and s390x, there is no need to keep it in ifarch here since mozilla tests support ifarch conditions
 %patch19 -p1