[FFmpeg-devel] [PATCH] swresample/arm: avoid conditional branch to PLT in THUMB-2.

[Rahul Chaudhry]

It was reported on github that this patch causes build errors with xcode:
  https://github.com/FFmpeg/FFmpeg/commit/b22db4f465c9adb2cf1489e04f7b65ef6bb55b8b#commitcomment-28725295

The attached patch fixes the build errors by renaming the labels. This time
I've tested it with clang from xcode on a MacBook to verify that the build
works.

Thanks,
Rahul


On Thu, Apr 19, 2018 at 11:06 AM, Michael Niedermayer
<michael at niedermayer.cc> wrote:
> On Wed, Apr 18, 2018 at 04:40:28PM -0700, Rahul Chaudhry wrote:
>> On Wed, Apr 18, 2018 at 3:46 PM, Michael Niedermayer
>> <michael at niedermayer.cc> wrote:
>> > please make sure this works on apple based arm (unless you know it works)
>> > (ive tested qemu linux based)
>> >
>> > Also please add a commit message
>>
>> If by 'apple based arm' you mean llvm/clang assembler, then yes, I've verified
>> that the assembly works with armv7a-cros-linux-gnueabi-clang (version 7.0.0).
>>
>> Updated patch with new commit message is attached.
>>
>> Thanks,
>> Rahul
>
>> From 2e3318acf266b519e98b680102a07196d6ddbf93 Mon Sep 17 00:00:00 2001
>> From: Rahul Chaudhry <rahulchaudhry at chromium.org>
>> Date: Wed, 18 Apr 2018 16:29:39 -0700
>> Subject: [PATCH] swresample/arm: remove unintentional relocation.
>
> ok, will apply
>
> thx
-------------- next part --------------
From a58b726947cc22081d899894036fa01933dfac0a Mon Sep 17 00:00:00 2001
From: Rahul Chaudhry <rahulchaudhry at chromium.org>
Date: Fri, 27 Apr 2018 13:49:52 -0700
Subject: [PATCH] swresample/arm: rename labels to fix xcode build error

---
 libswresample/arm/audio_convert_neon.S | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git libswresample/arm/audio_convert_neon.S libswresample/arm/audio_convert_neon.S
index 7729514701d3a02d04146f24cd9b12b11548ac64..085d50aafa5cf364e357d251a3986fad55643589 100644
--- libswresample/arm/audio_convert_neon.S
+++ libswresample/arm/audio_convert_neon.S
@@ -22,7 +22,7 @@
 #include "libavutil/arm/asm.S"
 
 function swri_oldapi_conv_flt_to_s16_neon, export=1
-_swri_oldapi_conv_flt_to_s16_neon:
+.L_swri_oldapi_conv_flt_to_s16_neon:
         subs            r2,  r2,  #8
         vld1.32         {q0},     [r1,:128]!
         vcvt.s32.f32    q8,  q0,  #31
@@ -67,7 +67,7 @@ _swri_oldapi_conv_flt_to_s16_neon:
 endfunc
 
 function swri_oldapi_conv_fltp_to_s16_2ch_neon, export=1
-_swri_oldapi_conv_fltp_to_s16_2ch_neon:
+.L_swri_oldapi_conv_fltp_to_s16_2ch_neon:
         ldm             r1,  {r1, r3}
         subs            r2,  r2,  #8
         vld1.32         {q0},     [r1,:128]!
@@ -135,8 +135,8 @@ function swri_oldapi_conv_fltp_to_s16_nch_neon, export=1
         cmp             r3,  #2
         itt             lt
         ldrlt           r1,  [r1]
-        blt             _swri_oldapi_conv_flt_to_s16_neon
-        beq             _swri_oldapi_conv_fltp_to_s16_2ch_neon
+        blt             .L_swri_oldapi_conv_flt_to_s16_neon
+        beq             .L_swri_oldapi_conv_fltp_to_s16_2ch_neon
 
         push            {r4-r8, lr}
         cmp             r3,  #4
-- 
2.13.5