From c3510c74f7f93cc8c20cf1f2e2e3b49af3ddf06e Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Fri, 20 Jun 2014 22:40:55 +0000 Subject: [PATCH] Use compact unwind for the iOS simulator. Another step in fixing pr19185. llvm-svn: 211416 --- llvm/lib/MC/MCObjectFileInfo.cpp | 5 +++++ llvm/test/MC/X86/no-elf-compact-unwind.s | 1 + 2 files changed, 6 insertions(+) diff --git a/llvm/lib/MC/MCObjectFileInfo.cpp b/llvm/lib/MC/MCObjectFileInfo.cpp index ebc67ac..971b1a6 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 017c52a..4e9236b 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 -- 2.7.4