diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2012-10-18 22:42:31 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2012-10-18 22:42:31 +0000 |
| commit | f552d3841b6532f7185dd022248aec793e6122bc (patch) | |
| tree | f882fba7c6bc258ac07780a530b6745539488bf7 /clang/lib/Driver/Tools.cpp | |
| parent | c9d645d30619ffad3e256928cb3d8cdc4c541998 (diff) | |
| download | bcm5719-llvm-f552d3841b6532f7185dd022248aec793e6122bc.tar.gz bcm5719-llvm-f552d3841b6532f7185dd022248aec793e6122bc.zip | |
Revert r166223 and the subsequent commits that depend on it, r166230 & r166235.
This seems to have introduced assertion hit when building compiler-rt.
llvm-svn: 166245
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 80691ee9c40..07d24b411ca 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -200,12 +200,6 @@ static void addProfileRT(const ToolChain &TC, const ArgList &Args, CmdArgs.push_back(Args.MakeArgString(ProfileRT)); } -static bool forwardToGCC(const Option &O) { - return !O.hasFlag(options::NoForward) && - !O.hasFlag(options::DriverOption) && - !O.hasFlag(options::LinkerInput); -} - void Clang::AddPreprocessingOptions(Compilation &C, const Driver &D, const ArgList &Args, @@ -3201,7 +3195,7 @@ void gcc::Common::ConstructJob(Compilation &C, const JobAction &JA, for (ArgList::const_iterator it = Args.begin(), ie = Args.end(); it != ie; ++it) { Arg *A = *it; - if (forwardToGCC(A->getOption())) { + if (A->getOption().hasForwardToGCC()) { // Don't forward any -g arguments to assembly steps. if (isa<AssembleJobAction>(JA) && A->getOption().matches(options::OPT_g_Group)) @@ -3426,7 +3420,7 @@ void hexagon::Link::ConstructJob(Compilation &C, const JobAction &JA, for (ArgList::const_iterator it = Args.begin(), ie = Args.end(); it != ie; ++it) { Arg *A = *it; - if (forwardToGCC(A->getOption())) { + if (A->getOption().hasForwardToGCC()) { // Don't forward any -g arguments to assembly steps. if (isa<AssembleJobAction>(JA) && A->getOption().matches(options::OPT_g_Group)) |
