mirror of
https://git.yoctoproject.org/poky
synced 2026-05-09 17:39:31 +00:00
ffmpeg: fix build with binutils 2.43 on arm with commerical codecs
binutils 2.43 is stricter with label names, so rename a label to stop assembler errors. [ YOCTO #15570 ] (From OE-Core rev: 06d29af58521b94518c924468db34d0eed1cb056) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
9b2c1ef319
commit
b997e4dc9c
+52
@@ -0,0 +1,52 @@
|
|||||||
|
From 0b541aa54b9573d8eef7401a0cc58c422fe60a9a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ross Burton <ross.burton@arm.com>
|
||||||
|
Date: Thu, 8 Aug 2024 18:04:17 +0100
|
||||||
|
Subject: [PATCH] libavcodec/arm/mlpdsp_armv5te: fix label format to work with
|
||||||
|
binutils 2.43
|
||||||
|
|
||||||
|
binutils 2.43 has stricter validation for labels[1] and results in errors
|
||||||
|
when building ffmpeg for armv5:
|
||||||
|
|
||||||
|
src/libavcodec/arm/mlpdsp_armv5te.S:232: Error: junk at end of line, first unrecognized character is `0'
|
||||||
|
|
||||||
|
Remove the leading zero in the "01" label to resolve this error.
|
||||||
|
|
||||||
|
[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=226749d5a6ff0d5c607d6428d6c81e1e7e7a994b
|
||||||
|
|
||||||
|
Upstream-Status: Submitted [https://ffmpeg.org//pipermail/ffmpeg-devel/2024-August/332149.html]
|
||||||
|
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
||||||
|
---
|
||||||
|
libavcodec/arm/mlpdsp_armv5te.S | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libavcodec/arm/mlpdsp_armv5te.S b/libavcodec/arm/mlpdsp_armv5te.S
|
||||||
|
index 4f9aa48..d315686 100644
|
||||||
|
--- a/libavcodec/arm/mlpdsp_armv5te.S
|
||||||
|
+++ b/libavcodec/arm/mlpdsp_armv5te.S
|
||||||
|
@@ -229,7 +229,7 @@ A .endif
|
||||||
|
.endif
|
||||||
|
|
||||||
|
// Begin loop
|
||||||
|
-01:
|
||||||
|
+1:
|
||||||
|
.if TOTAL_TAPS == 0
|
||||||
|
// Things simplify a lot in this case
|
||||||
|
// In fact this could be pipelined further if it's worth it...
|
||||||
|
@@ -241,7 +241,7 @@ A .endif
|
||||||
|
str ST0, [PST, #-4]!
|
||||||
|
str ST0, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)]
|
||||||
|
str ST0, [PSAMP], #4 * MAX_CHANNELS
|
||||||
|
- bne 01b
|
||||||
|
+ bne 1b
|
||||||
|
.else
|
||||||
|
.if \fir_taps & 1
|
||||||
|
.set LOAD_REG, 1
|
||||||
|
@@ -333,7 +333,7 @@ T orr AC0, AC0, AC1
|
||||||
|
str ST3, [PST, #-4]!
|
||||||
|
str ST2, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)]
|
||||||
|
str ST3, [PSAMP], #4 * MAX_CHANNELS
|
||||||
|
- bne 01b
|
||||||
|
+ bne 1b
|
||||||
|
.endif
|
||||||
|
b 99f
|
||||||
|
|
||||||
@@ -27,6 +27,7 @@ SRC_URI = " \
|
|||||||
file://av1_ordering_info.patch \
|
file://av1_ordering_info.patch \
|
||||||
file://vulkan_av1_stable_API.patch \
|
file://vulkan_av1_stable_API.patch \
|
||||||
file://vulkan_fix_gcc14.patch \
|
file://vulkan_fix_gcc14.patch \
|
||||||
|
file://0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968"
|
SRC_URI[sha256sum] = "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968"
|
||||||
|
|||||||
Reference in New Issue
Block a user