git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 0b541aa54b9573d8eef7401a0cc58c422fe60a9a Mon Sep 17 00:00:00 2001
   2 From: Ross Burton <ross.burton@arm.com>
   3 Date: Thu, 8 Aug 2024 18:04:17 +0100
   4 Subject: [PATCH] libavcodec/arm/mlpdsp_armv5te: fix label format to work with
   5  binutils 2.43
   6
   7 binutils 2.43 has stricter validation for labels[1] and results in errors
   8 when building ffmpeg for armv5:
   9
  10 src/libavcodec/arm/mlpdsp_armv5te.S:232: Error: junk at end of line, first unrecognized character is `0'
  11
  12 Remove the leading zero in the "01" label to resolve this error.
  13
  14 [1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=226749d5a6ff0d5c607d6428d6c81e1e7e7a994b
  15
  16 Upstream-Status: Submitted [https://ffmpeg.org//pipermail/ffmpeg-devel/2024-August/332149.html]
  17 Signed-off-by: Ross Burton <ross.burton@arm.com>
  18 ---
  19  libavcodec/arm/mlpdsp_armv5te.S | 6 +++---
  20  1 file changed, 3 insertions(+), 3 deletions(-)
  21
  22 diff --git a/libavcodec/arm/mlpdsp_armv5te.S b/libavcodec/arm/mlpdsp_armv5te.S
  23 index 4f9aa48..d315686 100644
  24 --- a/libavcodec/arm/mlpdsp_armv5te.S
  25 +++ b/libavcodec/arm/mlpdsp_armv5te.S
  26 @@ -229,7 +229,7 @@ A .endif
  27    .endif
  28
  29          // Begin loop
  30 -01:
  31 +1:
  32    .if TOTAL_TAPS == 0
  33          // Things simplify a lot in this case
  34          // In fact this could be pipelined further if it's worth it...
  35 @@ -241,7 +241,7 @@ A .endif
  36          str     ST0, [PST, #-4]!
  37          str     ST0, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)]
  38          str     ST0, [PSAMP], #4 * MAX_CHANNELS
  39 -        bne     01b
  40 +        bne     1b
  41    .else
  42      .if \fir_taps & 1
  43        .set LOAD_REG, 1
  44 @@ -333,7 +333,7 @@ T       orr     AC0, AC0, AC1
  45          str     ST3, [PST, #-4]!
  46          str     ST2, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)]
  47          str     ST3, [PSAMP], #4 * MAX_CHANNELS
  48 -        bne     01b
  49 +        bne     1b
  50    .endif
  51          b       99f
  52