87 lines
2.5 KiB
Diff
87 lines
2.5 KiB
Diff
|
From 9572dc5a124b46ac60c6cea34994ccc69ec53442 Mon Sep 17 00:00:00 2001
|
||
|
|
From: David Engel <dengel@mythtv.org>
|
||
|
|
Date: Thu, 27 Jul 2023 20:49:56 -0500
|
||
|
|
Subject: [PATCH] Fix FFmpeg compilation with binutils >= 2.41.
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
This is from FFmpeg commit effadce6c756247ea8bae32dc13bb3e6f464f0eb .
|
||
|
|
|
||
|
|
Author: Rémi Denis-Courmont <remi@remlab.net>
|
||
|
|
Date: Sun Jul 16 18:18:02 2023 +0300
|
||
|
|
|
||
|
|
avcodec/x86/mathops: clip constants used with shift instructions within inline assembly
|
||
|
|
|
||
|
|
Fixes assembling with binutil as >= 2.41
|
||
|
|
|
||
|
|
Signed-off-by: James Almer <jamrial@gmail.com>
|
||
|
|
|
||
|
|
Refs #765
|
||
|
|
|
||
|
|
(cherry picked from commit f9f9bba62ee2743c816cb2b9634b6b4397e5e2e3)
|
||
|
|
---
|
||
|
|
.../external/FFmpeg/libavcodec/x86/mathops.h | 26 ++++++++++++++++---
|
||
|
|
1 file changed, 23 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/mythtv/external/FFmpeg/libavcodec/x86/mathops.h b/mythtv/external/FFmpeg/libavcodec/x86/mathops.h
|
||
|
|
index 6298f5ed198..ca7e2dffc10 100644
|
||
|
|
--- a/mythtv/external/FFmpeg/libavcodec/x86/mathops.h
|
||
|
|
+++ b/mythtv/external/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;
|
||
|
|
}
|
||
|
|
|