r200555 - Last option on -fexception for arm-disable-ehabi

[Renato Golin]

Author: rengolin
Date: Fri Jan 31 10:19:26 2014
New Revision: 200555

URL: http://llvm.org/viewvc/llvm-project?rev=200555&view=rev
Log:
Last option on -fexception for arm-disable-ehabi

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

Modified:
    cfe/trunk/lib/Driver/Tools.cpp

Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=200555&r1=200554&r2=200555&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Fri Jan 31 10:19:26 2014
@@ -832,9 +832,12 @@ void Clang::AddARMTargetArgs(const ArgLi
     }
 
     // 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");
+      }
     }
 }