diff options
| author | Alexey Samsonov <samsonov@google.com> | 2012-05-29 08:10:34 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2012-05-29 08:10:34 +0000 |
| commit | a9cd83b1ddfa7d05e2887f59532e59e626b03ef6 (patch) | |
| tree | 655a0e6339aeaea25b4a6e87f668ec57f1dcc692 | |
| parent | c4d7675ddd598e3d89237cd04eeba3be322e560c (diff) | |
Make Clang driver pass the last option from -g group to the compiler.
Leave a better fixme for different debug info flags
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@157602 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Driver/Tools.cpp | 19 | ||||
| -rw-r--r-- | test/Driver/debug-options.c | 20 |
2 files changed, 32 insertions, 7 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 1769077f8e..752a58b9c4 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -1839,15 +1839,22 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, D.CCLogDiagnosticsFilename : "-"); } - // Special case debug options to only pass -g to clang. This is - // wrong. + // Use the last option from "-g" group. "-gline-tables-only" is + // preserved, all other debug options are substituted with "-g". + // FIXME: We should eventually do the following: + // 1) collapse gdb and dwarf variations to -g (as we do now); + // 2) support things like -gtoggle; + // 3) ignore flag options like -gstrict-dwarf or -grecord-gcc-switches; + // 4) produce a driver error on unsupported formats + // (-gstabs, -gcoff, -gvms etc.) Args.ClaimAllArgs(options::OPT_g_Group); - if (Arg *A = Args.getLastArg(options::OPT_g_Group)) - if (!A->getOption().matches(options::OPT_g0)) { + if (Arg *A = Args.getLastArg(options::OPT_g_Group)) { + if (A->getOption().matches(options::OPT_gline_tables_only)) { + CmdArgs.push_back("-gline-tables-only"); + } else if (!A->getOption().matches(options::OPT_g0)) { CmdArgs.push_back("-g"); } - if (Args.hasArg(options::OPT_gline_tables_only)) - CmdArgs.push_back("-gline-tables-only"); + } Args.AddAllArgs(CmdArgs, options::OPT_ffunction_sections); Args.AddAllArgs(CmdArgs, options::OPT_fdata_sections); diff --git a/test/Driver/debug-options.c b/test/Driver/debug-options.c index b0ad285735..76fcb7b56a 100644 --- a/test/Driver/debug-options.c +++ b/test/Driver/debug-options.c @@ -7,8 +7,13 @@ // RUN: %clang -### -c -ganything %s 2>&1 | FileCheck -check-prefix=GANY %s // RUN: %clang -### -c -ggdb %s 2>&1 | FileCheck -check-prefix=GGDB %s // RUN: %clang -### -c -gfoo %s 2>&1 | FileCheck -check-prefix=GFOO %s +// RUN: %clang -### -c -g -g0 %s 2>&1 | FileCheck -check-prefix=GG0 %s // RUN: %clang -### -c -gline-tables-only %s 2>&1 \ // RUN: | FileCheck -check-prefix=GLTO %s +// RUN: %clang -### -c -gline-tables-only -g %s 2>&1 \ +// RUN: | FileCheck -check-prefix=GLTO2 %s +// RUN: %clang -### -c -gline-tables-only -g0 %s 2>&1 \ +// RUN: | FileCheck -check-prefix=GLTO3 %s // // G: "-cc1" // G: "-g" @@ -28,5 +33,18 @@ // GFOO: "-cc1" // GFOO-NOT: "-g" // +// GG0: "-cc1" +// GG0-NOT: "-g" +// // GLTO: "-cc1" -// GLTO: "-g" +// GLTO-NOT: "-g" +// GLTO: "-gline-tables-only" +// GLTO-NOT: "-g" +// +// GLTO2: "-cc1" +// GLTO2-NOT: "-gline-tables-only" +// GLTO2: "-g" +// GLTO2-NOT: "-gline-tables-only" +// +// GLTO3: "-cc1" +// GLTO3-NOT: "-gline-tables-only" |