aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Degawa <ccom@randomderp.com>2023-01-02 17:01:28 -0600
committerMartin Storsjö <martin@martin.st>2023-04-02 00:34:10 +0300
commit182663a58a7a099e02e76da3b0f96d63e5c26a6d (patch)
treeff9db4932c8ee8cc587ecf7618033f1976b59349
parentc125860892e931d9b10f88ace73c91484815c3a8 (diff)
downloadffmpeg-182663a58a7a099e02e76da3b0f96d63e5c26a6d.tar.gz
get_cabac_inline_x86: Don't inline the assembly function on 32 bit
While the inline cabac assembly has worked correctly in i386 builds historically, modern compiler updates has started showing issues with it, when the function gets inlined into larger contexts that fail to provide the amount of free registers as this function requires. This was an issue with Clang on Windows on i386, which was fixed in c6d284b945324a7bc70ea8b9056040c8148aa835. However, recently the same issues also have started showing up with GCC (both for Windows and Linux). Whether the issue appears seems dependent on a lot of optimizer tuning (e.g. the issue appears or goes away depenent on the combinaton of -march= and -mtune= options), potentially due to the compiler making different decisions on how much to inline. Fixes: https://trac.ffmpeg.org/ticket/8903 Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r--libavcodec/x86/cabac.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/cabac.h b/libavcodec/x86/cabac.h
index b046a56a6b..ce2aefcbac 100644
--- a/libavcodec/x86/cabac.h
+++ b/libavcodec/x86/cabac.h
@@ -178,7 +178,7 @@
#if HAVE_7REGS && !BROKEN_COMPILER
#define get_cabac_inline get_cabac_inline_x86
static
-#if defined(_WIN32) && !defined(_WIN64) && defined(__clang__)
+#if ARCH_X86_32
av_noinline
#else
av_always_inline