diff options
| author | Petr Hosek <phosek@chromium.org> | 2019-05-29 01:51:56 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2019-05-29 01:51:56 +0000 |
| commit | 529118fc87c0ca274a4355c3f90ddd7b07215b2d (patch) | |
| tree | 0d1ae865a241b086995f25ce0dad1022256eb03b /compiler-rt/lib/builtins | |
| parent | 19f703e0d77c657c89322ed337e22d9283cd20d5 (diff) | |
| download | bcm5719-llvm-529118fc87c0ca274a4355c3f90ddd7b07215b2d.tar.gz bcm5719-llvm-529118fc87c0ca274a4355c3f90ddd7b07215b2d.zip | |
[builtins] Move the compare2f definition outside of the macro
This should hopefully address the error we're seeing in older versions
of Clang.
Differential Revision: https://reviews.llvm.org/D62554
llvm-svn: 361909
Diffstat (limited to 'compiler-rt/lib/builtins')
| -rw-r--r-- | compiler-rt/lib/builtins/arm/comparesf2.S | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/compiler-rt/lib/builtins/arm/comparesf2.S b/compiler-rt/lib/builtins/arm/comparesf2.S index 442c880e31e..a87cadf1b98 100644 --- a/compiler-rt/lib/builtins/arm/comparesf2.S +++ b/compiler-rt/lib/builtins/arm/comparesf2.S @@ -38,12 +38,11 @@ #include "../assembly.h" - .macro COMPARESF2_FUNCTION name:req handle_nan:req -@ int \name(float a, float b) - - .p2align 2 -DEFINE_COMPILERRT_FUNCTION(\name) + .syntax unified + .text + DEFINE_CODE_STATE + .macro COMPARESF2_FUNCTION_BODY handle_nan:req #if defined(COMPILER_RT_ARMHF_TARGET) vmov r0, s0 vmov r1, s1 @@ -168,12 +167,12 @@ LOCAL_LABEL(CHECK_NAN\@): \handle_nan JMP(lr) #endif -END_COMPILERRT_FUNCTION(\name) .endm - .syntax unified - .text - DEFINE_CODE_STATE +@ int __eqsf2(float a, float b) + + .p2align 2 +DEFINE_COMPILERRT_FUNCTION(__eqsf2) .macro __eqsf2_handle_nan #if defined(USE_THUMB_1) @@ -183,7 +182,9 @@ END_COMPILERRT_FUNCTION(\name) #endif .endm -COMPARESF2_FUNCTION __eqsf2, __eqsf2_handle_nan +COMPARESF2_FUNCTION_BODY __eqsf2_handle_nan + +END_COMPILERRT_FUNCTION(__eqsf2) DEFINE_COMPILERRT_FUNCTION_ALIAS(__lesf2, __eqsf2) DEFINE_COMPILERRT_FUNCTION_ALIAS(__ltsf2, __eqsf2) @@ -194,6 +195,11 @@ DEFINE_COMPILERRT_FUNCTION_ALIAS(__nesf2, __eqsf2) DEFINE_COMPILERRT_FUNCTION_ALIAS(__cmpsf2, __lesf2) #endif +@ int __gtsf2(float a, float b) + + .p2align 2 +DEFINE_COMPILERRT_FUNCTION(__gtsf2) + .macro __gtsf2_handle_nan #if defined(USE_THUMB_1) movs r0, #1 @@ -203,7 +209,9 @@ DEFINE_COMPILERRT_FUNCTION_ALIAS(__cmpsf2, __lesf2) #endif .endm -COMPARESF2_FUNCTION __gtsf2, __gtsf2_handle_nan +COMPARESF2_FUNCTION_BODY __gtsf2_handle_nan + +END_COMPILERRT_FUNCTION(__gtsf2) DEFINE_COMPILERRT_FUNCTION_ALIAS(__gesf2, __gtsf2) |
