[PATCH] D14757: Handle ARMv7K as an alias, instead of fake architecture (NFC)

[Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL253676: Avoid duplicate entry for cortex-a7 in the TargetParser (NFC) (authored by askrobov).

Changed prior to commit:
  http://reviews.llvm.org/D14757?vs=40626&id=40788#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D14757

Files:
  llvm/trunk/include/llvm/Support/ARMTargetParser.def
  llvm/trunk/lib/Support/Triple.cpp

Index: llvm/trunk/include/llvm/Support/ARMTargetParser.def
===================================================================
--- llvm/trunk/include/llvm/Support/ARMTargetParser.def
+++ llvm/trunk/include/llvm/Support/ARMTargetParser.def
@@ -213,7 +213,6 @@
 ARM_CPU_NAME("xscale", AK_XSCALE, FK_NONE, true, AEK_NONE)
 ARM_CPU_NAME("swift", AK_ARMV7S, FK_NEON_VFPV4, true,
              (AEK_HWDIVARM | AEK_HWDIV))
-ARM_CPU_NAME("cortex-a7", AK_ARMV7K, FK_NONE, true, AEK_HWDIVARM | AEK_HWDIV)
 // Invalid CPU
 ARM_CPU_NAME("invalid", AK_INVALID, FK_INVALID, true, AEK_INVALID)
 #undef ARM_CPU_NAME
Index: llvm/trunk/lib/Support/Triple.cpp
===================================================================
--- llvm/trunk/lib/Support/Triple.cpp
+++ llvm/trunk/lib/Support/Triple.cpp
@@ -1370,6 +1370,12 @@
   case llvm::Triple::Win32:
     // FIXME: this is invalid for WindowsCE
     return "cortex-a9";
+  case llvm::Triple::MacOSX:
+  case llvm::Triple::IOS:
+  case llvm::Triple::WatchOS:
+    if (MArch == "v7k")
+      return "cortex-a7";
+    break;
   default:
     break;
   }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D14757.40788.patch
Type: text/x-patch
Size: 1088 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20151120/2605eb11/attachment.bin>