summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-04-08 13:18:59 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-04-13 11:56:07 +0100
commite6cb422333ff6fa758602091057e49eed22b145d (patch)
tree3ce7f8d5d9cdf0e131adeeb79c4289c5e58d0498
parentb85f62ba30321469b9670a7f40b1663635b233fb (diff)
downloadpoky-e6cb422333ff6fa758602091057e49eed22b145d.tar.gz
ffmpeg: Disable asm and rvv on riscv32
ffmpeg 6.0 has added assembly routines which uses rv64i ISA unconditionally, ideally it should check for ISA before using those instructions. Fixes errors like <instantiation>:1:1: error: instruction requires the following: RV64I Base Instruction Set ld t0, (a1) ^ src/libavcodec/riscv/pixblockdsp_rvi.S:24:1: note: while in macro instantiation .irp row, 0, 1, 2, 3, 4, 5, 6, 7 ^ <instantiation>:3:9: error: instruction requires the following: RV64I Base Instruction Set sd zero, ((0 * 16) + 0)(a0) ^ (From OE-Core rev: 010b068bcc126dbbc1e2032997e8d83360a7de35) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb
index e4a4a0effa..7db43a8281 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb
@@ -126,7 +126,7 @@ EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mips32r2', '--disable-mi
126EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mips32r6', '--disable-mips64r2 --disable-mips32r2', '', d)}" 126EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mips32r6', '--disable-mips64r2 --disable-mips32r2', '', d)}"
127EXTRA_OECONF:append:mips = " --extra-libs=-latomic --disable-mips32r5 --disable-mipsdsp --disable-mipsdspr2 \ 127EXTRA_OECONF:append:mips = " --extra-libs=-latomic --disable-mips32r5 --disable-mipsdsp --disable-mipsdspr2 \
128 --disable-loongson2 --disable-loongson3 --disable-mmi --disable-msa" 128 --disable-loongson2 --disable-loongson3 --disable-mmi --disable-msa"
129EXTRA_OECONF:append:riscv32 = " --extra-libs=-latomic" 129EXTRA_OECONF:append:riscv32 = " --extra-libs=-latomic --disable-rvv --disable-asm"
130EXTRA_OECONF:append:armv5 = " --extra-libs=-latomic" 130EXTRA_OECONF:append:armv5 = " --extra-libs=-latomic"
131EXTRA_OECONF:append:powerpc = " --extra-libs=-latomic" 131EXTRA_OECONF:append:powerpc = " --extra-libs=-latomic"
132 132