Last option on -fexception for arm-disable-ehabi

Previous commit would have a following flag overriding the behaviour
and not taken care of.

llvm-svn: 200555

1 files changed, 6 insertions, 3 deletions

diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 9577aaacd53..fafb95155dd 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -832,9 +832,12 @@ void Clang::AddARMTargetArgs(const ArgList &Args,
     }
 
     // Exception handling
-    if (Args.hasArg(options::OPT_fno_exceptions)) {
-      CmdArgs.push_back("-backend-option");
-      CmdArgs.push_back("-arm-disable-ehabi");
+    if (Arg *A = Args.getLastArg(options::OPT_fexceptions,
+                                 options::OPT_fno_exceptions)) {
+      if (A->getOption().matches(options::OPT_fno_exceptions)) {
+        CmdArgs.push_back("-backend-option");
+        CmdArgs.push_back("-arm-disable-ehabi");
+      }
     }
 }