From: NAKAMURA Takumi <geek4civic@gmail.com>
Date: Mon, 23 Jan 2012 09:14:42 +0000 (+0000)
Subject: ARMAsmPrinter.cpp: Try to fix up r148686. EnableARMEHABI was also here.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=db4b85f532314e5972fedb1c1e04820de3cabc83;p=oota-llvm.git

ARMAsmPrinter.cpp: Try to fix up r148686. EnableARMEHABI was also here.

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

diff --git a/lib/Target/ARM/ARMAsmPrinter.cpp b/lib/Target/ARM/ARMAsmPrinter.cpp
index 288b7f14e4c..e0b08f1f48e 100644
--- a/lib/Target/ARM/ARMAsmPrinter.cpp
+++ b/lib/Target/ARM/ARMAsmPrinter.cpp
@@ -1192,7 +1192,7 @@ void ARMAsmPrinter::EmitUnwindingInstruction(const MachineInstr *MI) {
   }
 }
 
-extern cl::opt<bool> EnableARMEHABI;
+extern cl::opt<ExceptionHandling::ARMEHABIMode> EnableARMEHABI;
 
 // Simple pseudo-instructions have their lowering (with expansion to real
 // instructions) auto-generated.
@@ -1203,7 +1203,8 @@ void ARMAsmPrinter::EmitInstruction(const MachineInstr *MI) {
     OutStreamer.EmitCodeRegion();
 
   // Emit unwinding stuff for frame-related instructions
-  if (EnableARMEHABI && MI->getFlag(MachineInstr::FrameSetup))
+  if (EnableARMEHABI != ExceptionHandling::ARMEHABIDisabled &&
+      MI->getFlag(MachineInstr::FrameSetup))
     EmitUnwindingInstruction(MI);
 
   // Do any auto-generated pseudo lowerings.