[FFmpeg-devel] [PATCH] libavcodec/arm/mlpdsp_armv5te: fix label format to work with binutils 2.43

[FFmpeg-devel] [PATCH] libavcodec/arm/mlpdsp_armv5te: fix label format to work with binutils 2.43

[Ross Burton]

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(-)

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
 
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] libavcodec/arm/mlpdsp_armv5te: fix label format to work with binutils 2.43

[Martin Storsjö]

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

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] libavcodec/arm/mlpdsp_armv5te: fix label format to work with binutils 2.43

[Sebastian Ramacher]

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
-- 
Sebastian Ramacher
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".