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
diff --git a/lib/Target/X86/X86FrameLowering.cpp b/lib/Target/X86/X86FrameLowering.cpp
index 19486f8..6bc349f 100644
--- a/lib/Target/X86/X86FrameLowering.cpp
+++ b/lib/Target/X86/X86FrameLowering.cpp
@@ -35,13 +35,6 @@
// FIXME: completely move here.
extern cl::opt<bool> ForceStackAlign;
-// FIXME: Remove once linker support is available. The feature exists only on
-// Darwin at the moment.
-static cl::opt<bool>
-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 @@
}
// 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));
}
