<div><div dir="auto">Hans,</div><div dir="auto"><br></div><div dir="auto">Could you please crossport this to the 5.0 release branch?  It is a fix for a release blocker, and has been reviewed by multiple people.  I don't expect it to be a stability concern.</div><div dir="auto"><br></div><div dir="auto">Thanks!</div><br><div class="gmail_quote"><div>On Wed, Aug 23, 2017 at 7:27 AM Oleg Ranevskyy via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: oleg<br>
Date: Wed Aug 23 07:26:31 2017<br>
New Revision: 311555<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=311555&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=311555&view=rev</a><br>
Log:<br>
[ARM][Compiler-rt] Fix AEABI builtins to correctly pass arguments to non-AEABI functions on HF targets<br>
<br>
Summary:<br>
This is a patch for PR34167.<br>
<br>
On HF targets functions like `__{eq,lt,le,ge,gt}df2` and `__{eq,lt,le,ge,gt}sf2` expect their arguments to be passed in d/s registers, while some of the AEABI builtins pass them in r registers.<br>
<br>
Reviewers: compnerd, peter.smith, asl<br>
<br>
Reviewed By: peter.smith, asl<br>
<br>
Subscribers: peter.smith, aemerson, dberris, javed.absar, llvm-commits, asl, kristof.beyls<br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D36675" rel="noreferrer" target="_blank">https://reviews.llvm.org/D36675</a><br>
<br>
Modified:<br>
    compiler-rt/trunk/lib/builtins/arm/aeabi_dcmp.S<br>
    compiler-rt/trunk/lib/builtins/arm/aeabi_fcmp.S<br>
<br>
Modified: compiler-rt/trunk/lib/builtins/arm/aeabi_dcmp.S<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/builtins/arm/aeabi_dcmp.S?rev=311555&r1=311554&r2=311555&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/builtins/arm/aeabi_dcmp.S?rev=311555&r1=311554&r2=311555&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/builtins/arm/aeabi_dcmp.S (original)<br>
+++ compiler-rt/trunk/lib/builtins/arm/aeabi_dcmp.S Wed Aug 23 07:26:31 2017<br>
@@ -18,11 +18,20 @@<br>
 //   }<br>
 // }<br>
<br>
+#if defined(COMPILER_RT_ARMHF_TARGET)<br>
+#  define CONVERT_DCMP_ARGS_TO_DF2_ARGS                    \<br>
+        vmov      d0, r0, r1                     SEPARATOR \<br>
+        vmov      d1, r2, r3<br>
+#else<br>
+#  define CONVERT_DCMP_ARGS_TO_DF2_ARGS<br>
+#endif<br>
+<br>
 #define DEFINE_AEABI_DCMP(cond)                            \<br>
         .syntax unified                          SEPARATOR \<br>
         .p2align 2                               SEPARATOR \<br>
 DEFINE_COMPILERRT_FUNCTION(__aeabi_dcmp ## cond)           \<br>
         push      { r4, lr }                     SEPARATOR \<br>
+        CONVERT_DCMP_ARGS_TO_DF2_ARGS            SEPARATOR \<br>
         bl        SYMBOL_NAME(__ ## cond ## df2) SEPARATOR \<br>
         cmp       r0, #0                         SEPARATOR \<br>
         b ## cond 1f                             SEPARATOR \<br>
<br>
Modified: compiler-rt/trunk/lib/builtins/arm/aeabi_fcmp.S<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/builtins/arm/aeabi_fcmp.S?rev=311555&r1=311554&r2=311555&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/builtins/arm/aeabi_fcmp.S?rev=311555&r1=311554&r2=311555&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/builtins/arm/aeabi_fcmp.S (original)<br>
+++ compiler-rt/trunk/lib/builtins/arm/aeabi_fcmp.S Wed Aug 23 07:26:31 2017<br>
@@ -18,11 +18,20 @@<br>
 //   }<br>
 // }<br>
<br>
+#if defined(COMPILER_RT_ARMHF_TARGET)<br>
+#  define CONVERT_FCMP_ARGS_TO_SF2_ARGS                    \<br>
+        vmov      s0, r0                         SEPARATOR \<br>
+        vmov      s1, r1<br>
+#else<br>
+#  define CONVERT_FCMP_ARGS_TO_SF2_ARGS<br>
+#endif<br>
+<br>
 #define DEFINE_AEABI_FCMP(cond)                            \<br>
         .syntax unified                          SEPARATOR \<br>
         .p2align 2                               SEPARATOR \<br>
 DEFINE_COMPILERRT_FUNCTION(__aeabi_fcmp ## cond)           \<br>
         push      { r4, lr }                     SEPARATOR \<br>
+        CONVERT_FCMP_ARGS_TO_SF2_ARGS            SEPARATOR \<br>
         bl        SYMBOL_NAME(__ ## cond ## sf2) SEPARATOR \<br>
         cmp       r0, #0                         SEPARATOR \<br>
         b ## cond 1f                             SEPARATOR \<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div></div><div dir="ltr">-- <br></div><div class="gmail_signature" data-smartmail="gmail_signature">Saleem Abdulrasool<br>compnerd (at) compnerd (dot) org</div>