From c8725d11f8756c57bdbceccc61062a9d560261c5 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Tue, 6 Sep 2011 23:47:14 +0000 Subject: [PATCH] Reenable compact unwind by default. However, also emit the old version of unwind information for older linkers. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@139206 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/X86/X86FrameLowering.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/Target/X86/X86FrameLowering.cpp b/lib/Target/X86/X86FrameLowering.cpp index 19486f871f0..6bc349ffc10 100644 --- a/lib/Target/X86/X86FrameLowering.cpp +++ b/lib/Target/X86/X86FrameLowering.cpp @@ -35,13 +35,6 @@ using namespace llvm; // FIXME: completely move here. extern cl::opt ForceStackAlign; -// FIXME: Remove once linker support is available. The feature exists only on -// Darwin at the moment. -static cl::opt -GenerateCompactUnwind("gen-compact-unwind", - cl::desc("Generate compact unwind encoding"), - cl::Hidden); - bool X86FrameLowering::hasReservedCallFrame(const MachineFunction &MF) const { return !MF.getFrameInfo()->hasVarSizedObjects(); } @@ -908,7 +901,7 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF) const { } // Darwin 10.7 and greater has support for compact unwind encoding. - if (GenerateCompactUnwind && STI.getTargetTriple().isMacOSX() && + if (STI.getTargetTriple().isMacOSX() && !STI.getTargetTriple().isMacOSXVersionLT(10, 7)) MMI.setCompactUnwindEncoding(getCompactUnwindEncoding(MF)); } -- 2.11.0