aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2011-08-31 16:19:51 +0000
committerEli Friedman <eli.friedman@gmail.com>2011-08-31 16:19:51 +0000
commitac86d43eae8bbfe5284d8e5fa17c141d1a7b1194 (patch)
treebbdafd1969fbba6daacaf309538d40d729bd8748
parentc967ad8c888994bddbfda3dd1a042f204de3ffe1 (diff)
downloadexternal_llvm-ac86d43eae8bbfe5284d8e5fa17c141d1a7b1194.tar.gz
external_llvm-ac86d43eae8bbfe5284d8e5fa17c141d1a7b1194.tar.bz2
external_llvm-ac86d43eae8bbfe5284d8e5fa17c141d1a7b1194.zip
Make sure we don't crash when -miphoneos-version-min is specified on x86. Hopefully this will fix gcc testsuite failures.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@138856 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Target/X86/X86FrameLowering.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Target/X86/X86FrameLowering.cpp b/lib/Target/X86/X86FrameLowering.cpp
index 381049b317..37cab937e9 100644
--- a/lib/Target/X86/X86FrameLowering.cpp
+++ b/lib/Target/X86/X86FrameLowering.cpp
@@ -901,7 +901,8 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF) const {
}
// Darwin 10.7 and greater has support for compact unwind encoding.
- if (STI.isTargetDarwin() && !STI.getTargetTriple().isMacOSXVersionLT(10, 7))
+ if (STI.getTargetTriple().isMacOSX() &&
+ !STI.getTargetTriple().isMacOSXVersionLT(10, 7))
MMI.setCompactUnwindEncoding(getCompactUnwindEncoding(MF));
}