0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch 1.9 KB

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