[PATCH] D43005: [ARM] Error out on .arm assembler directives on windows

Martin Storsjö via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Fri Mar 23 02:13:58 PDT 2018


This revision was not accepted when it landed; it landed in state "Needs Review".
This revision was automatically updated to reflect the committed changes.
Closed by commit rL328298: [ARM] Error out on .arm assembler directives on windows (authored by mstorsjo, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D43005?vs=139257&id=139562#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D43005

Files:
  llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
  llvm/trunk/test/MC/ARM/arm-thumb-cpus.s


Index: llvm/trunk/test/MC/ARM/arm-thumb-cpus.s
===================================================================
--- llvm/trunk/test/MC/ARM/arm-thumb-cpus.s
+++ llvm/trunk/test/MC/ARM/arm-thumb-cpus.s
@@ -19,6 +19,9 @@
 @ RUN: not llvm-mc -show-encoding -triple=armv6sm-eabi < %s 2>&1 \
 @ RUN:  | FileCheck %s --check-prefix=CHECK-THUMB-ONLY
 
+@ RUN: not llvm-mc -show-encoding -triple=thumbv7-win32-gnu < %s 2>&1 \
+@ RUN:  | FileCheck %s --check-prefix=CHECK-THUMB-ONLY
+
         @ Make sure correct diagnostics are given for CPUs without support for
         @ one or other of the execution states.
         .thumb
Index: llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
===================================================================
--- llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
+++ llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
@@ -153,6 +153,13 @@
       ARMArchFeature += ",+nacl-trap";
   }
 
+  if (TT.isOSWindows()) {
+    if (ARMArchFeature.empty())
+      ARMArchFeature = "+noarm";
+    else
+      ARMArchFeature += ",+noarm";
+  }
+
   return ARMArchFeature;
 }
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D43005.139562.patch
Type: text/x-patch
Size: 1129 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180323/b739bae5/attachment.bin>


More information about the llvm-commits mailing list