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
This commit is contained in:
Tilmann Scheller 2013-09-02 15:48:17 +00:00
parent 024e76b69b
commit 5bed440eb1
3 changed files with 5 additions and 10 deletions

View File

@ -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

View File

@ -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] }

View File

@ -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",