From: Bill Wendling <isanbard@gmail.com>
Date: Tue, 30 Aug 2011 20:54:11 +0000 (+0000)
Subject: Enable compact unwind info by default. This only applies to Darwin when CFI is
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=011a8e1684d2aaac08acf3c0eea160bb65c3728b;p=oota-llvm.git

Enable compact unwind info by default. This only applies to Darwin when CFI is
disabled.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@138826 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Target/X86/X86FrameLowering.cpp b/lib/Target/X86/X86FrameLowering.cpp
index c399ec3fa2e..da252a79ac8 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<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,8 +901,7 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF) const {
   }
 
   // Darwin 10.7 and greater has support for compact unwind encoding.
-  if (GenerateCompactUnwind &&
-      STI.isTargetDarwin() && !STI.getTargetTriple().isMacOSXVersionLT(10, 6))
+  if (STI.isTargetDarwin() && !STI.getTargetTriple().isMacOSXVersionLT(10, 6))
     MMI.setCompactUnwindEncoding(getCompactUnwindEncoding(MF));
 }