From b008c2daed707ec91fc5c76a40319b75d359b040 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Wed, 20 Sep 2023 22:12:39 +0200
Subject: [PATCH] Add same fix as for Firefox rhbz#2235654 binutils failure

ffmpeg upstream patch
https://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=effadce6c756247ea8bae32dc13bb3e6f464f0eb
---
 rhbz-2235654.patch | 59 ++++++++++++++++++++++++++++++++++++++++++++++
 thunderbird.spec   |  2 ++
 2 files changed, 61 insertions(+)
 create mode 100644 rhbz-2235654.patch

diff --git a/rhbz-2235654.patch b/rhbz-2235654.patch
new file mode 100644
index 0000000..0c3780c
--- /dev/null
+++ b/rhbz-2235654.patch
@@ -0,0 +1,59 @@
+diff -up firefox-117.0/media/ffvpx/libavcodec/x86/mathops.h.gccfailure firefox-117.0/media/ffvpx/libavcodec/x86/mathops.h
+--- firefox-117.0/media/ffvpx/libavcodec/x86/mathops.h.gccfailure	2023-08-24 20:33:54.000000000 +0200
++++ firefox-117.0/media/ffvpx/libavcodec/x86/mathops.h	2023-08-30 13:04:56.174949736 +0200
+@@ -35,12 +35,20 @@
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
+ {
+     int rt, dummy;
++    if (__builtin_constant_p(shift))
+     __asm__ (
+         "imull %3               \n\t"
+         "shrdl %4, %%edx, %%eax \n\t"
+         :"=a"(rt), "=d"(dummy)
+-        :"a"(a), "rm"(b), "ci"((uint8_t)shift)
++        :"a"(a), "rm"(b), "i"(shift & 0x1F)
+     );
++    else
++        __asm__ (
++            "imull %3               \n\t"
++            "shrdl %4, %%edx, %%eax \n\t"
++            :"=a"(rt), "=d"(dummy)
++            :"a"(a), "rm"(b), "c"((uint8_t)shift)
++        );
+     return rt;
+ }
+ 
+@@ -113,19 +121,31 @@ __asm__ volatile(\
+ // avoid +32 for shift optimization (gcc should do that ...)
+ #define NEG_SSR32 NEG_SSR32
+ static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("sarl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("sarl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }
+ 
+ #define NEG_USR32 NEG_USR32
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("shrl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("shrl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }
+ 
diff --git a/thunderbird.spec b/thunderbird.spec
index 4e1ce49..a8a2b90 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -109,6 +109,7 @@ Patch103:       rhbz-1219542-s390-build.patch
 Patch422:       0001-GLIBCXX-fix-for-GCC-12.patch
 Patch425:       build-disable-elfhack.patch
 Patch426:       build-rnp.patch
+Patch427:       rhbz-2235654.patch
 
 # PPC fix
 Patch304:       mozilla-1245783.patch
@@ -278,6 +279,7 @@ debug %{name}, you want to install %{name}-debuginfo instead.
 %patch -P 425 -p1 -b .build-disable-elfhack
 %endif
 %patch -P 426 -p1 -b .build-rnp
+%patch -P 427 -p1 -b .rhbz-2235654
 # most likely fixed
 #%patch -P 419 -p1 -b .bindgen