diff options
| -rw-r--r-- | include/clang/Driver/ArgList.h | 6 | ||||
| -rw-r--r-- | lib/Driver/ToolChains.cpp | 7 | ||||
| -rw-r--r-- | lib/Driver/Tools.cpp | 5 |
3 files changed, 13 insertions, 5 deletions
diff --git a/include/clang/Driver/ArgList.h b/include/clang/Driver/ArgList.h index beec27cf05..16396daa60 100644 --- a/include/clang/Driver/ArgList.h +++ b/include/clang/Driver/ArgList.h @@ -338,6 +338,12 @@ namespace driver { /// @name Arg Synthesis /// @{ + /// AddSynthesizedArg - Add a argument to the list of synthesized arguments + /// (to be freed). + void AddSynthesizedArg(Arg *A) { + SynthesizedArgs.push_back(A); + } + virtual const char *MakeArgString(llvm::StringRef Str) const; /// AddFlagArg - Construct a new FlagArg for the given option \arg Id and diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 19b1ec823d..9accfe7516 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -487,9 +487,8 @@ DerivedArgList *Darwin::TranslateArgs(const DerivedArgList &Args, if (getArchName() != A->getValue(Args, 0)) continue; - // FIXME: The arg is leaked here, and we should have a nicer - // interface for this. - unsigned Prev, Index = Prev = A->getIndex() + 1; + unsigned Index = Args.getBaseArgs().MakeIndex(A->getValue(Args, 1)); + unsigned Prev = Index; Arg *XarchArg = Opts.ParseOneArg(Args, Index); // If the argument parsing failed or more than one argument was @@ -509,6 +508,8 @@ DerivedArgList *Darwin::TranslateArgs(const DerivedArgList &Args, XarchArg->setBaseArg(A); A = XarchArg; + + DAL->AddSynthesizedArg(A); } // Sob. These is strictly gcc compatible for the time being. Apple diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index d2c1f2d921..f61c02640c 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -1074,8 +1074,9 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, else Std->render(Args, CmdArgs); - if (Arg *A = Args.getLastArg(options::OPT_trigraphs)) - if (A->getIndex() > Std->getIndex()) + if (Arg *A = Args.getLastArg(options::OPT_std_EQ, options::OPT_ansi, + options::OPT_trigraphs)) + if (A != Std) A->render(Args, CmdArgs); } else { // Honor -std-default. |