Revert 189756 for now, it doesn't match what rdar://14871821 really wants.

[oota-llvm.git] / lib / Target / ARM / ARMSubtarget.cpp

diff --git a/lib/Target/ARM/ARMSubtarget.cpp b/lib/Target/ARM/ARMSubtarget.cpp
index a8e62e5a5598f7ae95c7680f92d6598e854545fb..3111f5e385ee2023b45b6579e55b1af751ae6e9c 100644 (file)
--- a/lib/Target/ARM/ARMSubtarget.cpp
+++ b/lib/Target/ARM/ARMSubtarget.cpp
@@ -133,13 +133,8 @@ void ARMSubtarget::resetSubtargetFeatures(const MachineFunction *MF) {
 }
 
 void ARMSubtarget::resetSubtargetFeatures(StringRef CPU, StringRef FS) {
-  if (CPUString.empty()) {
-    if (isTargetIOS() && !getTargetTriple().isOSVersionLT(6))
-      // Default to Swift for iOS 6 or later versions.
-      CPUString = "swift";
-    else
-      CPUString = "generic";
-  }
+  if (CPUString.empty())
+    CPUString = "generic";
 
   // Insert the architecture feature derived from the target triple into the
   // feature string. This is important for setting features that are implied