maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Make Clang driver pass the last option from -g group to the compiler. 

Leave a better fixme for different debug info flags

llvm-svn: 157602
This commit is contained in:
Alexey Samsonov 2012-05-29 08:10:34 +00:00
parent e8ccc1134b
commit dda3a7f914
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
clang/lib/Driver/Tools.cpp
View File

@ -1839,15 +1839,22 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
D.CCLogDiagnosticsFilename : "-"); D.CCLogDiagnosticsFilename : "-");
} }
// Special case debug options to only pass -g to clang. This is // Use the last option from "-g" group. "-gline-tables-only" is
// wrong. // 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); Args.ClaimAllArgs(options::OPT_g_Group);
if (Arg *A = Args.getLastArg(options::OPT_g_Group)) if (Arg *A = Args.getLastArg(options::OPT_g_Group)) {
if (!A->getOption().matches(options::OPT_g0)) { 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"); 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_ffunction_sections);
Args.AddAllArgs(CmdArgs, options::OPT_fdata_sections); Args.AddAllArgs(CmdArgs, options::OPT_fdata_sections);

20
clang/test/Driver/debug-options.c
View File

@ -7,8 +7,13 @@
// RUN: %clang -### -c -ganything %s 2>&1 | FileCheck -check-prefix=GANY %s // 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 -ggdb %s 2>&1 | FileCheck -check-prefix=GGDB %s
// RUN: %clang -### -c -gfoo %s 2>&1 | FileCheck -check-prefix=GFOO %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: %clang -### -c -gline-tables-only %s 2>&1 \
// RUN: | FileCheck -check-prefix=GLTO %s // 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: "-cc1"
// G: "-g" // G: "-g"
@ -28,5 +33,18 @@
// GFOO: "-cc1" // GFOO: "-cc1"
// GFOO-NOT: "-g" // GFOO-NOT: "-g"
// //
// GG0: "-cc1"
// GG0-NOT: "-g"
//
// GLTO: "-cc1" // 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"