From: Renato Golin <renato.golin@linaro.org>
Date: Fri, 31 Jan 2014 16:19:26 +0000 (+0000)
Subject: Last option on -fexception for arm-disable-ehabi
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5595d21466d7cdbe89406501d77acaad9851c9a1;p=clang

Last option on -fexception for arm-disable-ehabi

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

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

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 9577aaacd5..fafb95155d 100644
--- a/lib/Driver/Tools.cpp
+++ b/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");
+      }
     }
 }