diff options
author | Roland Suchan | 2024-02-29 16:34:38 +0000 |
---|---|---|
committer | Roland Suchan | 2024-02-29 16:34:38 +0000 |
commit | 319f6cec233d67c0c7a20b14eb94884eafb4c2e7 (patch) | |
tree | 013be883855ddd78e0a36fed5d1bec704d9dfbee /0024-fix-gcc13-binutils.patch | |
download | aur-319f6cec233d67c0c7a20b14eb94884eafb4c2e7.tar.gz |
version 2.1-1
Diffstat (limited to '0024-fix-gcc13-binutils.patch')
-rw-r--r-- | 0024-fix-gcc13-binutils.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/0024-fix-gcc13-binutils.patch b/0024-fix-gcc13-binutils.patch new file mode 100644 index 000000000000..fd2fcd5792a2 --- /dev/null +++ b/0024-fix-gcc13-binutils.patch @@ -0,0 +1,59 @@ +diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h +index 6298f5e..ca7e2df 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; + } |