Reenable compact unwind by default. However, also emit the old version of unwind

information for older linkers.

llvm-svn: 139206

1 files changed, 1 insertions, 8 deletions

diff --git a/llvm/lib/Target/X86/X86FrameLowering.cpp b/llvm/lib/Target/X86/X86FrameLowering.cpp
index 19486f871f0..6bc349ffc10 100644
--- a/llvm/lib/Target/X86/X86FrameLowering.cpp
+++ b/llvm/lib/Target/X86/X86FrameLowering.cpp
@@ -35,13 +35,6 @@ using namespace llvm;
 // 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 @@ 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));
 }