diff options
-rw-r--r-- | lib/Driver/Tools.cpp | 4 | ||||
-rw-r--r-- | test/Driver/clang-g-opts.c | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index de9bdcc188..bc521008cf 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -929,7 +929,9 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, // Special case debug options to only pass -g to clang. This is // wrong. - if (Args.hasArg(options::OPT_g_Group)) + Args.ClaimAllArgs(options::OPT_g_Group); + Arg *Garg = Args.getLastArg(options::OPT_g_Group); + if (Garg && Garg != Args.getLastArg(options::OPT_g0)) CmdArgs.push_back("-g"); Args.AddLastArg(CmdArgs, options::OPT_nostdinc); diff --git a/test/Driver/clang-g-opts.c b/test/Driver/clang-g-opts.c new file mode 100644 index 0000000000..4dbdf61677 --- /dev/null +++ b/test/Driver/clang-g-opts.c @@ -0,0 +1,5 @@ +// RUN: %clang -S -v -o %t %s 2>&1 | not grep -w -- -g +// RUN: %clang -S -v -o %t %s -g 2>&1 | grep -w -- -g +// RUN: %clang -S -v -o %t %s -g0 2>&1 | not grep -w -- -g +// RUN: %clang -S -v -o %t %s -g -g0 2>&1 | not grep -w -- -g +// RUN: %clang -S -v -o %t %s -g0 -g 2>&1 | grep -w -- -g |