[llvm-commits] [llvm] r172472 - in /llvm/trunk: include/llvm/Object/MachOFormat.h lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp

[Quentin Colombet]

Author: qcolombet
Date: Mon Jan 14 15:07:43 2013
New Revision: 172472

URL: http://llvm.org/viewvc/llvm-project?rev=172472&view=rev
Log:
Complete the existing support of ARM v6m, v7m, and v7em, i.e., respectively cortex-m0, cortex-m3, and cortex-m4 on the backend side.

Adds new subtype values for the MachO format and use them when the related triple are set.

Modified:
    llvm/trunk/include/llvm/Object/MachOFormat.h
    llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp

Modified: llvm/trunk/include/llvm/Object/MachOFormat.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/MachOFormat.h?rev=172472&r1=172471&r2=172472&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/MachOFormat.h (original)
+++ llvm/trunk/include/llvm/Object/MachOFormat.h Mon Jan 14 15:07:43 2013
@@ -64,7 +64,10 @@
     CSARM_V7     = 9,
     CSARM_V7F    = 10,
     CSARM_V7S    = 11,
-    CSARM_V7K    = 12
+    CSARM_V7K    = 12,
+    CSARM_V6M    = 14,
+    CSARM_V7M    = 15,
+    CSARM_V7EM   = 16
   };
 
   /// \brief PowerPC Machine Subtypes.

Modified: llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp?rev=172472&r1=172471&r2=172472&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp (original)
+++ llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp Mon Jan 14 15:07:43 2013
@@ -672,12 +672,21 @@
     else if (TheTriple.getArchName() == "armv6" ||
         TheTriple.getArchName() == "thumbv6")
       return new DarwinARMAsmBackend(T, TT, object::mach::CSARM_V6);
+    else if (TheTriple.getArchName() == "armv6m" ||
+        TheTriple.getArchName() == "thumbv6m")
+      return new DarwinARMAsmBackend(T, TT, object::mach::CSARM_V6M);
+    else if (TheTriple.getArchName() == "armv7em" ||
+        TheTriple.getArchName() == "thumbv7em")
+      return new DarwinARMAsmBackend(T, TT, object::mach::CSARM_V7EM);
     else if (TheTriple.getArchName() == "armv7f" ||
         TheTriple.getArchName() == "thumbv7f")
       return new DarwinARMAsmBackend(T, TT, object::mach::CSARM_V7F);
     else if (TheTriple.getArchName() == "armv7k" ||
         TheTriple.getArchName() == "thumbv7k")
       return new DarwinARMAsmBackend(T, TT, object::mach::CSARM_V7K);
+    else if (TheTriple.getArchName() == "armv7m" ||
+        TheTriple.getArchName() == "thumbv7m")
+      return new DarwinARMAsmBackend(T, TT, object::mach::CSARM_V7M);
     else if (TheTriple.getArchName() == "armv7s" ||
         TheTriple.getArchName() == "thumbv7s")
       return new DarwinARMAsmBackend(T, TT, object::mach::CSARM_V7S);