From 5bed440eb13b4104b64fa9c557954f335aac2aab Mon Sep 17 00:00:00 2001 From: Tilmann Scheller Date: Mon, 2 Sep 2013 15:48:17 +0000 Subject: [PATCH] Revert 189756 for now, it doesn't match what rdar://14871821 really wants. What we really want is to enable Swift by default for *v7s triples (and there already seems to be some logic which attempts to do that). In that case the iOS version doesn't matter. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@189763 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/ARM/ARMSubtarget.cpp | 9 ++------- test/CodeGen/ARM/struct_byval.ll | 2 +- test/CodeGen/ARM/swift-atomics.ll | 4 ++-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/lib/Target/ARM/ARMSubtarget.cpp b/lib/Target/ARM/ARMSubtarget.cpp index a8e62e5a559..3111f5e385e 100644 --- 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 diff --git a/test/CodeGen/ARM/struct_byval.ll b/test/CodeGen/ARM/struct_byval.ll index 0b3d7afe6cd..012b9948537 100644 --- a/test/CodeGen/ARM/struct_byval.ll +++ b/test/CodeGen/ARM/struct_byval.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -mtriple=armv7-apple-ios6.0 -mcpu=generic| FileCheck %s +; RUN: llc < %s -mtriple=armv7-apple-ios6.0 | FileCheck %s ; rdar://9877866 %struct.SmallStruct = type { i32, [8 x i32], [37 x i8] } diff --git a/test/CodeGen/ARM/swift-atomics.ll b/test/CodeGen/ARM/swift-atomics.ll index 883165fc024..1d718155710 100644 --- a/test/CodeGen/ARM/swift-atomics.ll +++ b/test/CodeGen/ARM/swift-atomics.ll @@ -1,5 +1,5 @@ -; RUN: llc -mtriple=armv7-apple-ios6.0 < %s | FileCheck %s -; RUN: llc -mtriple=armv7-apple-ios6.0 -mcpu=generic < %s | FileCheck %s --check-prefix=CHECK-STRICT-ATOMIC +; RUN: llc -mtriple=armv7-apple-ios6.0 -mcpu=swift < %s | FileCheck %s +; RUN: llc -mtriple=armv7-apple-ios6.0 < %s | FileCheck %s --check-prefix=CHECK-STRICT-ATOMIC ; Release operations only need the store barrier provided by a "dmb ishst", -- 2.34.1