Revert r150222, as the clang driver now handles this properly.

Now that the clang driver passes the CPU and feature information to
the backend when processing assembly files (150273), this isn't necessary.

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

diff --git a/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp b/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
index bc6d8f9894453de020d7b8e2efda86a9194f3279..e86f48e309ce022beff018ee0d037861be58174f 100644 (file)
--- a/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
+++ b/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
@@ -66,21 +66,13 @@ std::string ARM_MC::ParseARMTriple(StringRef TT) {
         // v7a: FeatureNEON, FeatureDB, FeatureDSPThumb2, FeatureT2XtPk
         ARMArchFeature = "+v7,+neon,+db,+t2dsp,+t2xtpk";
     } else if (SubVer == '6') {
-      Triple TheTriple(TT);
-      if (Len >= Idx+3 && TT[Idx+1] == 't' && TT[Idx+2] == '2') {
+      if (Len >= Idx+3 && TT[Idx+1] == 't' && TT[Idx+2] == '2')
         ARMArchFeature = "+v6t2";
-        // On darwin, v6 implies VFP.
-        if (TheTriple.isOSDarwin())
-          ARMArchFeature += ",+vfp2";
-      } else if (Len >= Idx+2 && TT[Idx+1] == 'm')
+      else if (Len >= Idx+2 && TT[Idx+1] == 'm')
         // v6m: FeatureNoARM, FeatureMClass
         ARMArchFeature = "+v6t2,+noarm,+mclass";
-      else {
+      else
         ARMArchFeature = "+v6";
-        // On darwin, v6 implies VFP.
-        if (TheTriple.isOSDarwin())
-          ARMArchFeature += ",+vfp2";
-      }
     } else if (SubVer == '5') {
       if (Len >= Idx+3 && TT[Idx+1] == 't' && TT[Idx+2] == 'e')
         ARMArchFeature = "+v5te";