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)); }