[builtins] Move the compare2f definition outside of the macro

[phosek]

Summary

This should hopefully address the error we're seeing in older versions
of Clang.

[mclow.lists]

This seems to have resolved my problem with apple-clang-8. Thanks!

compiler-rt/trunk/lib/builtins/arm/comparesf2.S

 //
 // Note that __lesf2( ) and __gesf2( ) are identical except in their handling of
 // NaN values.
 //
 //===----------------------------------------------------------------------===//
 
 #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
 #endif
     // Make copies of a and b with the sign bit shifted off the top.  These will
     // be used to detect zeros and NaNs.
 #if defined(USE_THUMB_1)
     push    {r6, lr}
2:
     pop     {r6, pc}
 #else
     cmp     r2,         #0xff000000
     ite ls
     cmpls   r3,         #0xff000000
     \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)
     movs    r0,         #1
 #else
     movhi   r0,         #1
 #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)
 DEFINE_COMPILERRT_FUNCTION_ALIAS(__nesf2, __eqsf2)
 
 #if defined(__ELF__)
 // Alias for libgcc compatibility
 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
     negs    r0,         r0
 #else
     movhi   r0,         #-1
 #endif
     .endm
 
-COMPARESF2_FUNCTION __gtsf2, __gtsf2_handle_nan
+COMPARESF2_FUNCTION_BODY __gtsf2_handle_nan
+
+END_COMPILERRT_FUNCTION(__gtsf2)
 
 DEFINE_COMPILERRT_FUNCTION_ALIAS(__gesf2, __gtsf2)
 
 @ int __unordsf2(float a, float b)
 
     .p2align 2
 DEFINE_COMPILERRT_FUNCTION(__unordsf2)