From 5595d21466d7cdbe89406501d77acaad9851c9a1 Mon Sep 17 00:00:00 2001 From: Renato Golin Date: Fri, 31 Jan 2014 16:19:26 +0000 Subject: [PATCH] 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 --- lib/Driver/Tools.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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"); + } } } -- 2.40.0