From: Tim Northover <tnorthover@apple.com>
Date: Mon, 2 Nov 2015 18:21:07 +0000 (+0000)
Subject: WatchOS: update default CPU for triple after t2dsp -> dsp rename
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8985f872f1be4583e1d4de8ffd57b4bc5521d74e;p=oota-llvm.git

WatchOS: update default CPU for triple after t2dsp -> dsp rename

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@251814 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp b/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
index d016ad8d079..7be092ac2ca 100644
--- a/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
+++ b/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
@@ -190,9 +190,9 @@ std::string ARM_MC::ParseARMTriple(const Triple &TT, StringRef CPU) {
     break;
   case Triple::ARMSubArch_v7k:
     if (NoCPU)
-      // v7k: FeatureNEON, FeatureDB, FeatureDSPThumb2, FeatureHasRAS
+      // v7k: FeatureNEON, FeatureDB, FeatureDSP, FeatureHasRAS
       //      A7
-      ARMArchFeature = "+v7,+a7,+neon,+db,+t2dsp,+ras";
+      ARMArchFeature = "+v7,+a7,+neon,+db,+dsp,+ras";
     else
       // Use CPU to figure out the exact features.
       ARMArchFeature = "+v7";
diff --git a/test/MC/ARM/v7k-dsp.s b/test/MC/ARM/v7k-dsp.s
new file mode 100644
index 00000000000..cf510174638
--- /dev/null
+++ b/test/MC/ARM/v7k-dsp.s
@@ -0,0 +1,4 @@
+@ RUN: llvm-mc -triple thumbv7k-apple-watchos2.0 %s | FileCheck %s
+
+@ CHECK: usad8 r2, r1, r4
+    usad8 r2, r1, r4