multimedia/gstreamer1-libav: unbreak FFMPEG=off with CPUTYPE >= haswell

In file included from libavcodec/hevc_cabac.c:27:
In file included from libavcodec/cabac_functions.h:46:
libavcodec/x86/cabac.h:193:9: error: inline assembly requires more registers than available
        BRANCHLESS_GET_CABAC("%0", "%q0", "(%4)", "%1", "%w1",
        ^
libavcodec/x86/cabac.h:143:9: note: expanded from macro 'BRANCHLESS_GET_CABAC'
        "movzbl "statep"    , "ret"                                     \n\t"\
        ^
libavcodec/x86/cabac.h:193:9: error: inline assembly requires more registers than available
libavcodec/x86/cabac.h:143:9: note: expanded from macro 'BRANCHLESS_GET_CABAC'
        "movzbl "statep"    , "ret"                                     \n\t"\
        ^
libavcodec/x86/cabac.h:193:9: error: inline assembly requires more registers than available
libavcodec/x86/cabac.h:143:9: note: expanded from macro 'BRANCHLESS_GET_CABAC'
        "movzbl "statep"    , "ret"                                     \n\t"\
        ^
libavcodec/x86/cabac.h:193:9: error: inline assembly requires more registers than available
libavcodec/x86/cabac.h:143:9: note: expanded from macro 'BRANCHLESS_GET_CABAC'
        "movzbl "statep"    , "ret"                                     \n\t"\
        ^
libavcodec/x86/cabac.h:193:9: error: inline assembly requires more registers than available
libavcodec/x86/cabac.h:143:9: note: expanded from macro 'BRANCHLESS_GET_CABAC'
        "movzbl "statep"    , "ret"                                     \n\t"\
        ^
libavcodec/x86/cabac.h:193:9: error: inline assembly requires more registers than available
libavcodec/x86/cabac.h:143:9: note: expanded from macro 'BRANCHLESS_GET_CABAC'
        "movzbl "statep"    , "ret"                                     \n\t"\
        ^
libavcodec/x86/cabac.h:193:9: error: inline assembly requires more registers than available
libavcodec/x86/cabac.h:143:9: note: expanded from macro 'BRANCHLESS_GET_CABAC'
        "movzbl "statep"    , "ret"                                     \n\t"\
        ^
libavcodec/x86/cabac.h:193:9: error: inline assembly requires more registers than available
libavcodec/x86/cabac.h:143:9: note: expanded from macro 'BRANCHLESS_GET_CABAC'
        "movzbl "statep"    , "ret"                                     \n\t"\
        ^
libavcodec/x86/cabac.h:193:9: error: inline assembly requires more registers than available
libavcodec/x86/cabac.h:143:9: note: expanded from macro 'BRANCHLESS_GET_CABAC'
        "movzbl "statep"    , "ret"                                     \n\t"\
        ^
libavcodec/x86/cabac.h:193:9: error: inline assembly requires more registers than available
libavcodec/x86/cabac.h:143:9: note: expanded from macro 'BRANCHLESS_GET_CABAC'
        "movzbl "statep"    , "ret"                                     \n\t"\
        ^
libavcodec/x86/cabac.h:193:9: error: inline assembly requires more registers than available
libavcodec/x86/cabac.h:143:9: note: expanded from macro 'BRANCHLESS_GET_CABAC'
        "movzbl "statep"    , "ret"                                     \n\t"\
        ^
This commit is contained in:
Jan Beich 2018-04-30 13:19:36 +00:00
parent cf07da5e14
commit 26bf82c7fb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=468699

View file

@ -0,0 +1,11 @@
--- gst-libs/ext/libav/libavutil/x86/asm.h.orig 2017-09-18 13:21:09 UTC
+++ gst-libs/ext/libav/libavutil/x86/asm.h
@@ -72,7 +72,7 @@ typedef int32_t x86_reg;
typedef int x86_reg;
#endif
-#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
+#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE && !defined(__clang__)))
#define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))
#if ARCH_X86_64 && defined(PIC)