diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-20 22:40:55 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-20 22:40:55 +0000 |
| commit | c3510c74f7f93cc8c20cf1f2e2e3b49af3ddf06e (patch) | |
| tree | a7b1233f4533540a234a187001d702f5e1adff6c | |
| parent | becdf63f7db6b412a039a804f63cde8f314be647 (diff) | |
| download | bcm5719-llvm-c3510c74f7f93cc8c20cf1f2e2e3b49af3ddf06e.tar.gz bcm5719-llvm-c3510c74f7f93cc8c20cf1f2e2e3b49af3ddf06e.zip | |
Use compact unwind for the iOS simulator.
Another step in fixing pr19185.
llvm-svn: 211416
| -rw-r--r-- | llvm/lib/MC/MCObjectFileInfo.cpp | 5 | ||||
| -rw-r--r-- | llvm/test/MC/X86/no-elf-compact-unwind.s | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/llvm/lib/MC/MCObjectFileInfo.cpp b/llvm/lib/MC/MCObjectFileInfo.cpp index ebc67acf4cc..971b1a6e40b 100644 --- a/llvm/lib/MC/MCObjectFileInfo.cpp +++ b/llvm/lib/MC/MCObjectFileInfo.cpp @@ -31,6 +31,11 @@ static bool useCompactUnwind(const Triple &T) { if (T.isMacOSX() && !T.isMacOSXVersionLT(10, 6)) return true; + // And the iOS simulator. + if (T.isiOS() && + (T.getArch() == Triple::x86_64 || T.getArch() == Triple::x86)) + return true; + return false; } diff --git a/llvm/test/MC/X86/no-elf-compact-unwind.s b/llvm/test/MC/X86/no-elf-compact-unwind.s index 017c52ae9f3..4e9236b8797 100644 --- a/llvm/test/MC/X86/no-elf-compact-unwind.s +++ b/llvm/test/MC/X86/no-elf-compact-unwind.s @@ -1,4 +1,5 @@ // RUN: llvm-mc < %s -filetype=obj -triple x86_64-apple-macosx10.8.0 | llvm-readobj -s | FileCheck -check-prefix=MACHO %s +// RUN: llvm-mc < %s -filetype=obj -triple x86_64-apple-ios7.0.0 | llvm-readobj -s | FileCheck -check-prefix=MACHO %s // RUN: llvm-mc < %s -filetype=obj -triple x86_64-unknown-linux | llvm-readobj -s | FileCheck -check-prefix=ELF %s .globl __Z3barv |
