[builtins] Do not force thumb mode directive in arm/sync-ops.h

[raj.khem]

Summary

.thumb_func was not switching mode until [1]
so it did not show up but now that .thumb_func (without argument) is
switching mode, its causing build failures on armv6 ( rpi0 ) even when
build is explicitly asking for this file to be built with -marm (ARM
mode), therefore use DEFINE_COMPILERRT_FUNCTION macro to add function
header which considers arch and mode from compiler cmdline to decide if
the function is built using thumb mode or arm mode.

[1] https://reviews.llvm.org/D101975

Note that it also needs

https://reviews.llvm.org/D99282

[compnerd]

Some platforms (e.g. WoA) do require thumb-only compilation. Can we conditionalize this on whether we are building for ARMv6 or not?

[raj.khem]

In D104183#2815292, @compnerd wrote:

Some platforms (e.g. WoA) do require thumb-only compilation. Can we conditionalize this on whether we are building for ARMv6 or not?

for such platforms I think passing -mthumb via cmdline would be required which then will work just fine here since DEFINE_COMPILERRT_FUNCTION
will add needed directives automatically.

[peter.smith]

For ELF targets I think this should work fine. However looking at the previous change I think this may break the Darwin build. This change looks like it reverts:

commit 84610ba9b38d917317ac997074acacd99962d767
Author: Steven Wu <[e-mail]>
Date:   Sat Oct 4 00:18:59 2014 +0000

    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>

    llvm-svn: 219040

I think we'll need a way to get .thumb_func added for Darwin or potentially call DEFINE_COMPILERRT_FUNCTION for Armv6.

[raj.khem]

In D104183#2816953, @peter.smith wrote:

For ELF targets I think this should work fine. However looking at the previous change I think this may break the Darwin build. This change looks like it reverts:

commit 84610ba9b38d917317ac997074acacd99962d767
Author: Steven Wu <[e-mail]>
Date:   Sat Oct 4 00:18:59 2014 +0000

    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>

    llvm-svn: 219040

I think we'll need a way to get .thumb_func added for Darwin or potentially call DEFINE_COMPILERRT_FUNCTION for Armv6.

I looked at snapshot of code when this change was made and we did not have DECLARE_FUNC_ENCODING defined back then

#define DEFINE_COMPILERRT_FUNCTION(name)                                       \
  FILE_LEVEL_DIRECTIVE SEPARATOR                                               \
  .globl SYMBOL_NAME(name) SEPARATOR                                           \
  SYMBOL_IS_FUNC(SYMBOL_NAME(name)) SEPARATOR                                  \
  DECLARE_SYMBOL_VISIBILITY(name)                                              \
  SYMBOL_NAME(name):

#define DEFINE_COMPILERRT_THUMB_FUNCTION(name)                                 \
  FILE_LEVEL_DIRECTIVE SEPARATOR                                               \
  .globl SYMBOL_NAME(name) SEPARATOR                                           \
  THUMB_FUNC                                                                   \
  SYMBOL_IS_FUNC(SYMBOL_NAME(name)) SEPARATOR                                  \
  DECLARE_SYMBOL_VISIBILITY(name)                                              \
  SYMBOL_NAME(name):

now we use DECLARE_FUNC_ENCODING to define thumb/arm attribute for the function in DEFINE_COMPILERRT_FUNCTION macro

which is defined like this

#if defined(__thumb2__) || defined(__thumb__)
#define DEFINE_CODE_STATE .thumb SEPARATOR
#define DECLARE_FUNC_ENCODING    .thumb_func SEPARATOR
#if defined(__thumb2__)
....

#else // !defined(__thumb2__) && !defined(__thumb__)
#define DEFINE_CODE_STATE .arm SEPARATOR
#define DECLARE_FUNC_ENCODING
....

so perhaps it will work ok for darwin too maybe ?

[peter.smith]

OK with DECLARE_FUNC_ENCODING introduced in D31220, along with many similar changes of DEFINE_COMPILERRT_THUMB_FUNCTION to DEFINE_COMPILERRT_FUNCTION, if the file is compiled for Thumb DEFINE_COMPILERRT_FUNCTION will produce .thumb_func before the symbol as DEFINE_COMPILERRT_THUMB_FUNCTION. It seems like the only remaining use case of DEFINE_COMPILER_RT_THUMB_FUNCTION is to force Thumb state.

With this change it looks like the only remaining use of DEFINE_COMPILERRT_THUMB_FUNCTION is in addsf3.S (D29485) the function is written with Thumb (does not require Thumb 2) in mind, although it should compile with Arm if needed. At some point it may be worth removing converting it to DEFINE_COMPILERRT_FUNCTION and removing DEFINE_COMPILERRT_THUMB_FUNCTION.

I've set approved, but please wait a few days to see if there are any objections.

[raj.khem]

@peter.smith Can you help landing this changeset ? there has been no objections on it thus far.

[MaskRay]

arc patch D104183 fails for me. You need to rebase on origin/main and upload a new version with arc diff --head=HEAD 'HEAD^'.

[raj.khem]

rebased

compiler-rt/lib/builtins/arm/sync-ops.h

 // ARM and Thumb-2 versions of the functions.
 //
 //===----------------------------------------------------------------------===//
 
 #include "../assembly.h"
 
 #define SYNC_OP_4(op)                                                          \
   .p2align 2;                                                                  \
-  .thumb;                                                                      \
   .syntax unified;                                                             \
-  DEFINE_COMPILERRT_THUMB_FUNCTION(__sync_fetch_and_##op)                      \
+  DEFINE_COMPILERRT_FUNCTION(__sync_fetch_and_##op)                            \
   DMB;                                                                         \
   mov r12, r0;                                                                 \
   LOCAL_LABEL(tryatomic_##op) : ldrex r0, [r12];                               \
   op(r2, r0, r1);                                                              \
   strex r3, r2, [r12];                                                         \
   cmp r3, #0;                                                                  \
   bne LOCAL_LABEL(tryatomic_##op);                                             \
   DMB;                                                                         \
   bx lr
 
 #define SYNC_OP_8(op)                                                          \
   .p2align 2;                                                                  \
-  .thumb;                                                                      \
   .syntax unified;                                                             \
-  DEFINE_COMPILERRT_THUMB_FUNCTION(__sync_fetch_and_##op)                      \
+  DEFINE_COMPILERRT_FUNCTION(__sync_fetch_and_##op)                            \
   push {r4, r5, r6, lr};                                                       \
   DMB;                                                                         \
   mov r12, r0;                                                                 \
   LOCAL_LABEL(tryatomic_##op) : ldrexd r0, r1, [r12];                          \
   op(r4, r5, r0, r1, r2, r3);                                                  \
   strexd r6, r4, r5, [r12];                                                    \
   cmp r6, #0;                                                                  \
   bne LOCAL_LABEL(tryatomic_##op);                                             \