[compiler-rt] r219040 - Fix the armv7 thumb builtins on darwin

[Bob Wilson]

> On Oct 4, 2014, at 3:27 AM, İsmail Dönmez <ismail at donmez.ws> wrote:
> 
> Hi,
> 
> On Sat, Oct 4, 2014 at 3:18 AM, Steven Wu <stevenwu at apple.com <mailto:stevenwu at apple.com>> wrote:
> Author: steven_wu
> Date: Fri Oct  3 19:18:59 2014
> New Revision: 219040
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=219040&view=rev <http://llvm.org/viewvc/llvm-project?rev=219040&view=rev>
> Log:
> Fix the armv7 thumb builtins on darwin
> 
> The arm builtins converted into thumb in r213481 are not working
> on darwin. On apple platforms, .thumb_func directive is required
> to generated correct symbols for thumb functions.
> 
> <rdar://problem/18523605>
> 
> This breaks compilation on ARM/Linux:
> 
> ../projects/compiler-rt/lib/builtins/arm/sync_fetch_and_add_4.S:20:92: error: unexpected token in argument list
> .p2align 2 ; .thumb ; .syntax unified ; ; .globl __sync_fetch_and_add_4 ; THUMB_FUNC .type __sync_fetch_and_add_4,%function ; __sync_fetch_and_add_4: dmb ; mov r12, r0 ; .L_tryatomic_add_4: ldrex r0, [r12] ; add r2, r0, r1 ; strex r3, r2, [r12] ; cmp r3, #0 ; bne .L_tryatomic_add_4 ; dmb ; bx lr
> 
> ../projects/compiler-rt/lib/builtins/arm/sync_fetch_and_add_8.S:22:92: error: unexpected token in argument list
> .p2align 2 ; .thumb ; .syntax unified ; ; .globl __sync_fetch_and_add_8 ; THUMB_FUNC .type __sync_fetch_and_add_8,%function ; __sync_fetch_and_add_8: push {r4, r5, r6, lr} ; dmb ; mov r12, r0 ; .L_tryatomic_add_8: ldrexd r0, r1, [r12] ; adds r4, r0, r2 ; adc r5, r1, r3 ; strexd r6, r4, r5, [r12] ; cmp r6, #0 ; bne .L_tryatomic_add_8 ; dmb ; pop {r4, r5, r6, pc}

r219064 should fix it.

(Steven, I also removed the reference to the Radar number. I don’t remember seeing that in the patch I originally reviewed. It is helpful Radar and bugzilla numbers in commit messages, but please don’t put them in comments in the code.)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20141004/72c9e01c/attachment.html>