From a6aa5d4e3ab68e94445c962256ad97c533bdc53b Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Sun, 1 Oct 2023 22:34:21 +0200 Subject: [PATCH] add binutils 2.41 patch for embedded ffmpeg --- binutils2.41.patch | 76 ++++++++++++++++++++++++++++++++++++++++++++++ seamonkey.spec | 2 ++ 2 files changed, 78 insertions(+) create mode 100644 binutils2.41.patch diff --git a/binutils2.41.patch b/binutils2.41.patch new file mode 100644 index 0000000..52a9310 --- /dev/null +++ b/binutils2.41.patch @@ -0,0 +1,76 @@ +From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001 +From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= +Date: Sun, 16 Jul 2023 18:18:02 +0300 +Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift + instructions within inline assembly + +Fixes assembling with binutil as >= 2.41 + +Signed-off-by: James Almer +--- + libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++--- + 1 file changed, 23 insertions(+), 3 deletions(-) + +diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h +index 6298f5ed19..ca7e2dffc1 100644 +--- a/libavcodec/x86/mathops.h ++++ b/libavcodec/x86/mathops.h +@@ -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; + } + +-- +2.25.1 + diff --git a/seamonkey.spec b/seamonkey.spec index b8960f3..d25a4e8 100644 --- a/seamonkey.spec +++ b/seamonkey.spec @@ -98,6 +98,7 @@ Patch3: %{name}-enable-addons.patch # Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade Patch4: %{name}-system-virtualenv.patch Patch5: %{name}-icu-detect.patch +Patch6: binutils2.41.patch URL: https://www.seamonkey-project.org/ BuildRequires: GConf2-devel >= 1.2.1 BuildRequires: autoconf2_13 >= 2.13 @@ -681,6 +682,7 @@ unpack() { %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 -d media/ffvpx %build cat << EOF > .mozconfig -- 2.44.0