diff options
| author | Tilmann Scheller <tilmann.scheller@googlemail.com> | 2013-09-02 15:48:17 +0000 |
|---|---|---|
| committer | Tilmann Scheller <tilmann.scheller@googlemail.com> | 2013-09-02 15:48:17 +0000 |
| commit | 5bed440eb13b4104b64fa9c557954f335aac2aab (patch) | |
| tree | 233d4045db0b73af1c63731e6abc736dc9426a70 /lib/Target | |
| parent | 024e76b69bc46a20e96eba22f2655d249c495d00 (diff) | |
| download | external_llvm-5bed440eb13b4104b64fa9c557954f335aac2aab.zip external_llvm-5bed440eb13b4104b64fa9c557954f335aac2aab.tar.gz external_llvm-5bed440eb13b4104b64fa9c557954f335aac2aab.tar.bz2 | |
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
Diffstat (limited to 'lib/Target')
| -rw-r--r-- | lib/Target/ARM/ARMSubtarget.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/Target/ARM/ARMSubtarget.cpp b/lib/Target/ARM/ARMSubtarget.cpp index a8e62e5..3111f5e 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 |