summaryrefslogtreecommitdiff
path: root/user/firefox-esr/BTS-1074.patch
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2023-10-03 22:22:35 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2023-10-03 22:22:35 -0500
commit8b1357c1f79c1e1d4b59bb4ff81d600a38350c5b (patch)
tree3cb77b3ae3cbf5b3f892b5ee103929824f68316d /user/firefox-esr/BTS-1074.patch
parentecb6205697ebc6959489ba77d3fe5c0b0d3e2a5a (diff)
downloadpackages-8b1357c1f79c1e1d4b59bb4ff81d600a38350c5b.tar.gz
packages-8b1357c1f79c1e1d4b59bb4ff81d600a38350c5b.tar.bz2
packages-8b1357c1f79c1e1d4b59bb4ff81d600a38350c5b.tar.xz
packages-8b1357c1f79c1e1d4b59bb4ff81d600a38350c5b.zip
user/{firefox-esr,thunderbird}: Fix x86 asm in avc
Required for binutils-2.41 upgrade. See patch for details. Fixes: #1074
Diffstat (limited to 'user/firefox-esr/BTS-1074.patch')
-rw-r--r--user/firefox-esr/BTS-1074.patch62
1 files changed, 62 insertions, 0 deletions
diff --git a/user/firefox-esr/BTS-1074.patch b/user/firefox-esr/BTS-1074.patch
new file mode 100644
index 000000000..fdc5478b4
--- /dev/null
+++ b/user/firefox-esr/BTS-1074.patch
@@ -0,0 +1,62 @@
+gas(1) under binutils-2.41 no longer allows invalid negative shifts.
+
+This patch fixes the bundled FFmpeg in Firefox to not use them.
+
+--- a/media/ffvpx/libavcodec/x86/mathops.h.old 2023-10-03 22:15:24.440738743 -0500
++++ b/media/ffvpx/libavcodec/x86/mathops.h 2023-10-03 22:15:41.458911245 -0500
+@@ -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 @@
+ // 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;
+ }
+