commit: ac80d3a8a81ae6a7dc68a31dcac519c830980e65 Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org> AuthorDate: Fri Aug 4 06:54:08 2023 +0000 Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> CommitDate: Fri Aug 4 06:55:00 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac80d3a8
www-client/chromium: fix building with binutils 2.41 Closes: https://bugs.gentoo.org/911687 Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> www-client/chromium/chromium-115.0.5790.170.ebuild | 1 + .../files/chromium-115-binutils-2.41.patch | 76 ++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/www-client/chromium/chromium-115.0.5790.170.ebuild b/www-client/chromium/chromium-115.0.5790.170.ebuild index 665ca347d034..ee04adc672c3 100644 --- a/www-client/chromium/chromium-115.0.5790.170.ebuild +++ b/www-client/chromium/chromium-115.0.5790.170.ebuild @@ -341,6 +341,7 @@ src_prepare() { "${FILESDIR}/chromium-111-InkDropHost-crash.patch" "${FILESDIR}/chromium-114-gcc12.patch" "${FILESDIR}/chromium-114-remove-evdev-dep.patch" + "${FILESDIR}/chromium-115-binutils-2.41.patch" ) if use ppc64 ; then diff --git a/www-client/chromium/files/chromium-115-binutils-2.41.patch b/www-client/chromium/files/chromium-115-binutils-2.41.patch new file mode 100644 index 000000000000..95f65eb6e33e --- /dev/null +++ b/www-client/chromium/files/chromium-115-binutils-2.41.patch @@ -0,0 +1,76 @@ +From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <r...@remlab.net> +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 <jamr...@gmail.com> +--- + 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/third_party/ffmpeg/libavcodec/x86/mathops.h ++++ b/third_party/ffmpeg/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.41.0 +
