From a0593985326592b21fa72f6b48662994a6c14898 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Mon, 17 Aug 2020 09:38:01 -0400
Subject: [PATCH] try gold only on aarch64, force fix_textrels fix in ffmpeg
 for i686 (even without lld)

---
 chromium-84.0.4147.125-i686-fix_textrels.patch | 12 ++++++++++++
 chromium.spec                                  |  6 +++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 chromium-84.0.4147.125-i686-fix_textrels.patch

diff --git a/chromium-84.0.4147.125-i686-fix_textrels.patch b/chromium-84.0.4147.125-i686-fix_textrels.patch
new file mode 100644
index 00000000..e0fd5ec3
--- /dev/null
+++ b/chromium-84.0.4147.125-i686-fix_textrels.patch
@@ -0,0 +1,12 @@
+diff -up chromium-84.0.4147.125/third_party/ffmpeg/BUILD.gn.i686-textrels chromium-84.0.4147.125/third_party/ffmpeg/BUILD.gn
+--- chromium-84.0.4147.125/third_party/ffmpeg/BUILD.gn.i686-textrels	2020-08-17 09:33:53.153653741 -0400
++++ chromium-84.0.4147.125/third_party/ffmpeg/BUILD.gn	2020-08-17 09:34:25.099564669 -0400
+@@ -68,7 +68,7 @@ if (has_nasm_deps) {
+     }
+ 
+     # See comments on fix_textrels config.
+-    if (use_lld && current_cpu == "x86" && !is_win) {
++    if (current_cpu == "x86" && !is_win) {
+       all_dependent_configs = [ ":fix_textrels" ]
+     }
+   }
diff --git a/chromium.spec b/chromium.spec
index 0730f988..2b7ddb1c 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -299,6 +299,8 @@ Patch87:	chromium-quiche-invalid-offsetof.patch
 Patch88:	chromium-84.0.4147.105-gn-gcc-cleanup.patch
 # Fix missing cstring in remoting code
 Patch89:	chromium-84.0.4147.125-remoting-cstring.patch
+# Apply fix_textrels hack for i686 (even without lld)
+Patch90:	chromium-84.0.4147.125-i686-fix_textrels.patch
 
 # Use lstdc++ on EPEL7 only
 Patch101:	chromium-75.0.3770.100-epel7-stdc++.patch
@@ -918,6 +920,7 @@ udev.
 %patch87 -p1 -b .quiche-invalid-offset
 %patch88 -p1 -b .gn-gcc-cleanup
 %patch89 -p1 -b .remoting-cstring
+%patch90 -p1 -b .i686-textrels
 
 # Fedora branded user agent
 %if 0%{?fedora}
@@ -1905,7 +1908,8 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 
 %changelog
 * Mon Aug 17 2020 Tom Callaway <spot@fedoraproject.org> - 84.0.4147.125-2
-- try to link with gold on i686/aarch64 (on F33+)
+- try to link with gold on aarch64 (on F33+)
+- force fix_textrels fix in ffmpeg for i686 (even without lld)
 
 * Mon Aug 10 2020 Tom Callaway <spot@fedoraproject.org> - 84.0.4147.125-1
 - update to 84.0.4147.125