diff options
| author | Tilmann Scheller <tilmann.scheller@googlemail.com> | 2013-09-02 12:01:58 +0000 |
|---|---|---|
| committer | Tilmann Scheller <tilmann.scheller@googlemail.com> | 2013-09-02 12:01:58 +0000 |
| commit | 024e76b69bc46a20e96eba22f2655d249c495d00 (patch) | |
| tree | 4abf78e7d31a017aa2d5540a9c6059c48ebdfe99 /lib/Target/ARM | |
| parent | 4629e0da6a19ea5883ecdfca841cacb3de657d73 (diff) | |
| download | external_llvm-024e76b69bc46a20e96eba22f2655d249c495d00.zip external_llvm-024e76b69bc46a20e96eba22f2655d249c495d00.tar.gz external_llvm-024e76b69bc46a20e96eba22f2655d249c495d00.tar.bz2 | |
ARM: Default to Swift when compiling for iOS 6 or later.
Test cases adjusted accordingly.
This fixes rdar://14871821.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@189756 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM')
| -rw-r--r-- | lib/Target/ARM/ARMSubtarget.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/Target/ARM/ARMSubtarget.cpp b/lib/Target/ARM/ARMSubtarget.cpp index 3111f5e..a8e62e5 100644 --- a/lib/Target/ARM/ARMSubtarget.cpp +++ b/lib/Target/ARM/ARMSubtarget.cpp @@ -133,8 +133,13 @@ void ARMSubtarget::resetSubtargetFeatures(const MachineFunction *MF) { } void ARMSubtarget::resetSubtargetFeatures(StringRef CPU, StringRef FS) { - if (CPUString.empty()) - CPUString = "generic"; + if (CPUString.empty()) { + if (isTargetIOS() && !getTargetTriple().isOSVersionLT(6)) + // Default to Swift for iOS 6 or later versions. + CPUString = "swift"; + else + CPUString = "generic"; + } // Insert the architecture feature derived from the target triple into the // feature string. This is important for setting features that are implied |