Revert r138826 until PR10834 can be fixed.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@139018 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling 2011-09-02 18:15:04 +00:00
parent f0851e5d95
commit d199aa012b

View File

@ -35,6 +35,13 @@ using namespace llvm;
// FIXME: completely move here. // FIXME: completely move here.
extern cl::opt<bool> ForceStackAlign; 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 { bool X86FrameLowering::hasReservedCallFrame(const MachineFunction &MF) const {
return !MF.getFrameInfo()->hasVarSizedObjects(); return !MF.getFrameInfo()->hasVarSizedObjects();
} }
@ -901,7 +908,7 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF) const {
} }
// Darwin 10.7 and greater has support for compact unwind encoding. // Darwin 10.7 and greater has support for compact unwind encoding.
if (STI.getTargetTriple().isMacOSX() && if (GenerateCompactUnwind && STI.getTargetTriple().isMacOSX() &&
!STI.getTargetTriple().isMacOSXVersionLT(10, 7)) !STI.getTargetTriple().isMacOSXVersionLT(10, 7))
MMI.setCompactUnwindEncoding(getCompactUnwindEncoding(MF)); MMI.setCompactUnwindEncoding(getCompactUnwindEncoding(MF));
} }