| Message ID | 20240809103200.4152601-1-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] libavcodec/arm/mlpdsp_armv5te: fix label format to work with binutils 2.43 | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
On Fri, 9 Aug 2024, Ross Burton wrote: > 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 > > Signed-off-by: Ross Burton <ross.burton@arm.com> > --- > libavcodec/arm/mlpdsp_armv5te.S | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) LGTM, thanks, I pushed this patch! // Martin
On 2024-08-13 23:24:06 +0300, Martin Storsjö wrote: > On Fri, 9 Aug 2024, Ross Burton wrote: > > > 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 > > > > Signed-off-by: Ross Burton <ross.burton@arm.com> > > --- > > libavcodec/arm/mlpdsp_armv5te.S | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > LGTM, thanks, I pushed this patch! This patch fixes #11074. Please backport to 7.0. Cheers
On Thu, 15 Aug 2024, Sebastian Ramacher wrote: > On 2024-08-13 23:24:06 +0300, Martin Storsjö wrote: >> On Fri, 9 Aug 2024, Ross Burton wrote: >> >> > 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 >> > >> > Signed-off-by: Ross Burton <ross.burton@arm.com> >> > --- >> > libavcodec/arm/mlpdsp_armv5te.S | 6 +++--- >> > 1 file changed, 3 insertions(+), 3 deletions(-) >> >> LGTM, thanks, I pushed this patch! > > This patch fixes #11074. Please backport to 7.0. Done, I backported this to 7.0 and a handful of earlier, seemingly active older branches. // Martin
diff --git a/libavcodec/arm/mlpdsp_armv5te.S b/libavcodec/arm/mlpdsp_armv5te.S index 4f9aa485fd..d31568611c 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
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 Signed-off-by: Ross Burton <ross.burton@arm.com> --- libavcodec/arm/mlpdsp_armv5te.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)