<div dir="ltr">I think this broke Green Dragon. Could you please take a look?<div><br></div><div><a href="http://green.lab.llvm.org/green/job/clang-stage1-configure-RA_build/39186/consoleFull#-187600398149ba4694-19c4-4d7e-bec5-911270d8a58c">http://green.lab.llvm.org/green/job/clang-stage1-configure-RA_build/39186/consoleFull#-187600398149ba4694-19c4-4d7e-bec5-911270d8a58c</a><br></div><div><br></div><div>Thanks</div><div><br></div><div>Cheers,</div><div>Juergen</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Sep 27, 2017 at 2:29 AM, Manoj Gupta via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: manojgupta<br>
Date: Wed Sep 27 02:29:57 2017<br>
New Revision: 314284<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=314284&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=314284&view=rev</a><br>
Log:<br>
[Builtins] ARM: Fix msr assembly instruction use for Thumb2.<br>
<br>
Summary:<br>
MSR instruction in Thumb2 does not support immediate operand.<br>
Fix this by moving the condition for V7-M to Thumb2 since V7-M support<br>
Thumb2 only. With this change, aeabi_cfcmp.s and aeabi_cdcmp.S files can<br>
be assembled in Thumb2 mode. (This is split out from the review D38227).<br>
<br>
Reviewers: compnerd, peter.smith, srhines, weimingz, rengolin, kristof.beyls<br>
<br>
Reviewed By: compnerd<br>
<br>
Subscribers: aemerson, javed.absar, llvm-commits<br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D38268" rel="noreferrer" target="_blank">https://reviews.llvm.org/<wbr>D38268</a><br>
<br>
Modified:<br>
    compiler-rt/trunk/lib/<wbr>builtins/arm/aeabi_cdcmp.S<br>
    compiler-rt/trunk/lib/<wbr>builtins/arm/aeabi_cfcmp.S<br>
<br>
Modified: compiler-rt/trunk/lib/<wbr>builtins/arm/aeabi_cdcmp.S<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/builtins/arm/aeabi_cdcmp.S?rev=314284&r1=314283&r2=314284&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/compiler-rt/trunk/lib/<wbr>builtins/arm/aeabi_cdcmp.S?<wbr>rev=314284&r1=314283&r2=<wbr>314284&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- compiler-rt/trunk/lib/<wbr>builtins/arm/aeabi_cdcmp.S (original)<br>
+++ compiler-rt/trunk/lib/<wbr>builtins/arm/aeabi_cdcmp.S Wed Sep 27 02:29:57 2017<br>
@@ -48,7 +48,7 @@ DEFINE_COMPILERRT_FUNCTION(__<wbr>aeabi_cdcmp<br>
         // NaN has been ruled out, so __aeabi_cdcmple can't trap<br>
         bne __aeabi_cdcmple<br>
<br>
-#if defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__)<br>
+#if defined(USE_THUMB_2)<br>
         mov ip, #APSR_C<br>
         msr APSR_nzcvq, ip<br>
 #else<br>
<br>
Modified: compiler-rt/trunk/lib/<wbr>builtins/arm/aeabi_cfcmp.S<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/builtins/arm/aeabi_cfcmp.S?rev=314284&r1=314283&r2=314284&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/compiler-rt/trunk/lib/<wbr>builtins/arm/aeabi_cfcmp.S?<wbr>rev=314284&r1=314283&r2=<wbr>314284&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- compiler-rt/trunk/lib/<wbr>builtins/arm/aeabi_cfcmp.S (original)<br>
+++ compiler-rt/trunk/lib/<wbr>builtins/arm/aeabi_cfcmp.S Wed Sep 27 02:29:57 2017<br>
@@ -48,7 +48,7 @@ DEFINE_COMPILERRT_FUNCTION(__<wbr>aeabi_cfcmp<br>
         // NaN has been ruled out, so __aeabi_cfcmple can't trap<br>
         bne __aeabi_cfcmple<br>
<br>
-#if defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__)<br>
+#if defined(USE_THUMB_2)<br>
         mov ip, #APSR_C<br>
         msr APSR_nzcvq, ip<br>
 #else<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">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/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>