<html><head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class="">[+Tim]<br class=""><div><br class=""><blockquote type="cite" class=""><div class="">On Sep 27, 2017, at 11:14 AM, Manoj Gupta <<a href="mailto:manojgupta@google.com" class="">manojgupta@google.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class=""><div class="">I don't know much about armv7k. But adding -marm to the command line fixes the error. <br class=""></div><div class="">clang -O2 -g -DNDEBUG -fPIC -O3 -fvisibility=hidden -DVISIBILITY_HIDDEN -Wall -arch armv7k -MMD -MT aeabi_cdcmp.S.o -MF aeabi_cdcmp.S.o.d -o aeabi_cdcmp.S.o -c aeabi_cdcmp.S -target armv7k-watchos // This fails<br class=""></div><div class=""><div class="">clang -O2 -g -DNDEBUG -fPIC -O3 -fvisibility=hidden -DVISIBILITY_HIDDEN -Wall -arch armv7k -MMD -MT aeabi_cdcmp.S.o -MF aeabi_cdcmp.S.o.d -o aeabi_cdcmp.S.o -c aeabi_cdcmp.S -target armv7k-watchos -marm // This works</div></div><div class=""><br class=""></div><div class="">This makes me think that the using armv7k target defaults to thumb but it wants compilation to be done in ARM mode for the builtins?</div><div class=""><br class=""></div><div class="">Thanks,</div><div class="">Manoj</div><div class=""><br class=""></div><div class=""><br class=""></div></div><div class="gmail_extra"><br class=""><div class="gmail_quote">On Wed, Sep 27, 2017 at 10:46 AM, Juergen Ributzka <span dir="ltr" class=""><<a href="mailto:juergen@ributzka.de" target="_blank" class="">juergen@ributzka.de</a>></span> wrote:<br class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr" class="">I think this broke Green Dragon. Could you please take a look?<div class=""><br class=""></div><div class=""><a href="http://green.lab.llvm.org/green/job/clang-stage1-configure-RA_build/39186/consoleFull#-187600398149ba4694-19c4-4d7e-bec5-911270d8a58c" target="_blank" class="">http://green.lab.llvm.org/<wbr class="">green/job/clang-stage1-<wbr class="">configure-RA_build/39186/<wbr class="">consoleFull#-<wbr class="">187600398149ba4694-19c4-4d7e-<wbr class="">bec5-911270d8a58c</a><br class=""></div><div class=""><br class=""></div><div class="">Thanks</div><div class=""><br class=""></div><div class="">Cheers,</div><div class="">Juergen</div></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br class=""><div class="gmail_quote">On Wed, Sep 27, 2017 at 2:29 AM, Manoj Gupta via llvm-commits <span dir="ltr" class=""><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank" class="">llvm-commits@lists.llvm.org</a>></span> wrote:<br class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: manojgupta<br class="">
Date: Wed Sep 27 02:29:57 2017<br class="">
New Revision: 314284<br class="">
<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=314284&view=rev" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject?rev=314284&view=rev</a><br class="">
Log:<br class="">
[Builtins] ARM: Fix msr assembly instruction use for Thumb2.<br class="">
<br class="">
Summary:<br class="">
MSR instruction in Thumb2 does not support immediate operand.<br class="">
Fix this by moving the condition for V7-M to Thumb2 since V7-M support<br class="">
Thumb2 only. With this change, aeabi_cfcmp.s and aeabi_cdcmp.S files can<br class="">
be assembled in Thumb2 mode. (This is split out from the review D38227).<br class="">
<br class="">
Reviewers: compnerd, peter.smith, srhines, weimingz, rengolin, kristof.beyls<br class="">
<br class="">
Reviewed By: compnerd<br class="">
<br class="">
Subscribers: aemerson, javed.absar, llvm-commits<br class="">
<br class="">
Differential Revision: <a href="https://reviews.llvm.org/D38268" rel="noreferrer" target="_blank" class="">https://reviews.llvm.org/D3826<wbr class="">8</a><br class="">
<br class="">
Modified:<br class="">
compiler-rt/trunk/lib/builtins<wbr class="">/arm/aeabi_cdcmp.S<br class="">
compiler-rt/trunk/lib/builtins<wbr class="">/arm/aeabi_cfcmp.S<br class="">
<br class="">
Modified: compiler-rt/trunk/lib/builtins<wbr class="">/arm/aeabi_cdcmp.S<br class="">
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" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/compiler-rt/trunk/lib/bu<wbr class="">iltins/arm/aeabi_cdcmp.S?rev=<wbr class="">314284&r1=314283&r2=314284&<wbr class="">view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- compiler-rt/trunk/lib/builtins<wbr class="">/arm/aeabi_cdcmp.S (original)<br class="">
+++ compiler-rt/trunk/lib/builtins<wbr class="">/arm/aeabi_cdcmp.S Wed Sep 27 02:29:57 2017<br class="">
@@ -48,7 +48,7 @@ DEFINE_COMPILERRT_FUNCTION(__a<wbr class="">eabi_cdcmp<br class="">
// NaN has been ruled out, so __aeabi_cdcmple can't trap<br class="">
bne __aeabi_cdcmple<br class="">
<br class="">
-#if defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__)<br class="">
+#if defined(USE_THUMB_2)<br class="">
mov ip, #APSR_C<br class="">
msr APSR_nzcvq, ip<br class="">
#else<br class="">
<br class="">
Modified: compiler-rt/trunk/lib/builtins<wbr class="">/arm/aeabi_cfcmp.S<br class="">
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" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/compiler-rt/trunk/lib/bu<wbr class="">iltins/arm/aeabi_cfcmp.S?rev=<wbr class="">314284&r1=314283&r2=314284&<wbr class="">view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- compiler-rt/trunk/lib/builtins<wbr class="">/arm/aeabi_cfcmp.S (original)<br class="">
+++ compiler-rt/trunk/lib/builtins<wbr class="">/arm/aeabi_cfcmp.S Wed Sep 27 02:29:57 2017<br class="">
@@ -48,7 +48,7 @@ DEFINE_COMPILERRT_FUNCTION(__a<wbr class="">eabi_cfcmp<br class="">
// NaN has been ruled out, so __aeabi_cfcmple can't trap<br class="">
bne __aeabi_cfcmple<br class="">
<br class="">
-#if defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__)<br class="">
+#if defined(USE_THUMB_2)<br class="">
mov ip, #APSR_C<br class="">
msr APSR_nzcvq, ip<br class="">
#else<br class="">
<br class="">
<br class="">
______________________________<wbr class="">_________________<br class="">
llvm-commits mailing list<br class="">
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank" class="">llvm-commits@lists.llvm.org</a><br class="">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank" class="">http://lists.llvm.org/cgi-bin/<wbr class="">mailman/listinfo/llvm-commits</a><br class="">
</blockquote></div><br class=""></div>
</div></div></blockquote></div><br class=""></div>
</div></blockquote></div><br class=""></body></html>