[llvm-commits] [llvm] r148694 - /llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp

[NAKAMURA Takumi]

Evgeniy, please confirm whether my fixup would be reasonable or not, thank you.

...Takumi

2012/1/23 NAKAMURA Takumi <geek4civic at gmail.com>:
> Author: chapuni
> Date: Mon Jan 23 03:14:42 2012
> New Revision: 148694
>
> URL: http://llvm.org/viewvc/llvm-project?rev=148694&view=rev
> Log:
> ARMAsmPrinter.cpp: Try to fix up r148686. EnableARMEHABI was also here.
>
> Modified:
>    llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp
>
> Modified: llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp?rev=148694&r1=148693&r2=148694&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp (original)
> +++ llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp Mon Jan 23 03:14:42 2012
> @@ -1192,7 +1192,7 @@
>   }
>  }
>
> -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 @@
>     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.
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits