diff mbox series

[FFmpeg-devel,2/2] swresample/aarch64: fix relocation out of range error

Message ID tencent_10E6337A15C969082EA405529308E85BD305@qq.com
State New
Headers show
Series [FFmpeg-devel,1/2] lavc/aarch64: fix relocation out of range error
Related show

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

zhilizhao(赵志立) Sept. 13, 2021, 7:24 a.m. UTC
From: Zhao Zhili <zhilizhao@tencent.com>

---
 libswresample/aarch64/audio_convert_neon.S | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Martin Storsjö Sept. 13, 2021, 11:01 a.m. UTC | #1
On Mon, 13 Sep 2021, Zhao Zhili wrote:

> From: Zhao Zhili <zhilizhao@tencent.com>
>
> ---
> libswresample/aarch64/audio_convert_neon.S | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/libswresample/aarch64/audio_convert_neon.S b/libswresample/aarch64/audio_convert_neon.S
> index 74feff448a..77779505b6 100644
> --- a/libswresample/aarch64/audio_convert_neon.S
> +++ b/libswresample/aarch64/audio_convert_neon.S
> @@ -131,8 +131,10 @@ endfunc
>
> function swri_oldapi_conv_fltp_to_s16_nch_neon, export=1
>         cmp             w3,  #2
> -        b.eq            X(swri_oldapi_conv_fltp_to_s16_2ch_neon)
>         b.gt            1f
> +        b.lt            2f
> +        b               X(swri_oldapi_conv_fltp_to_s16_2ch_neon)
> +2:
>         ldr             x1,  [x1]
>         b               X(swri_oldapi_conv_flt_to_s16_neon)
> 1:
> -- 
> 2.31.1

For this, instead of changing the code, maybe we could add local labels 
that can't be interposed by a symbol elsewhere? E.g. have a look at 
9dde6ab06c48f9447cd16f39bee33569cddb7be4.

// Martin
diff mbox series

Patch

diff --git a/libswresample/aarch64/audio_convert_neon.S b/libswresample/aarch64/audio_convert_neon.S
index 74feff448a..77779505b6 100644
--- a/libswresample/aarch64/audio_convert_neon.S
+++ b/libswresample/aarch64/audio_convert_neon.S
@@ -131,8 +131,10 @@  endfunc
 
 function swri_oldapi_conv_fltp_to_s16_nch_neon, export=1
         cmp             w3,  #2
-        b.eq            X(swri_oldapi_conv_fltp_to_s16_2ch_neon)
         b.gt            1f
+        b.lt            2f
+        b               X(swri_oldapi_conv_fltp_to_s16_2ch_neon)
+2:
         ldr             x1,  [x1]
         b               X(swri_oldapi_conv_flt_to_s16_neon)
 1: