Change -g so that it will override -g1 but not -g3.

gcc/
        PR debug/61013
	* opts.c (common_handle_option): Don't special-case "-g".
	(set_debug_level): Default to at least level 2 with "-g".

From-SVN: r210442
This commit is contained in:
Cary Coutant 2014-05-14 21:48:47 +00:00 committed by Cary Coutant
parent 5f35dde552
commit bc91b0e086
2 changed files with 12 additions and 9 deletions

View File

@ -1,3 +1,9 @@
2014-05-14 Cary Coutant <ccoutant@google.com>
PR debug/61013
* opts.c (common_handle_option): Don't special-case "-g".
(set_debug_level): Default to at least level 2 with "-g".
2014-05-14 DJ Delorie <dj@redhat.com>
* config/msp430/msp430.c (msp430_builtin): Add

View File

@ -1814,13 +1814,8 @@ common_handle_option (struct gcc_options *opts,
break;
case OPT_g:
/* -g by itself should force -g2. */
if (*arg == '\0')
set_debug_level (NO_DEBUG, DEFAULT_GDB_EXTENSIONS, "2", opts, opts_set,
loc);
else
set_debug_level (NO_DEBUG, DEFAULT_GDB_EXTENSIONS, arg, opts, opts_set,
loc);
set_debug_level (NO_DEBUG, DEFAULT_GDB_EXTENSIONS, arg, opts, opts_set,
loc);
break;
case OPT_gcoff:
@ -2070,10 +2065,12 @@ set_debug_level (enum debug_info_type type, int extended, const char *arg,
opts_set->x_write_symbols = type;
}
/* A debug flag without a level defaults to level 2. */
/* A debug flag without a level defaults to level 2.
If off or at level 1, set it to level 2, but if already
at level 3, don't lower it. */
if (*arg == '\0')
{
if (!opts->x_debug_info_level)
if (opts->x_debug_info_level < DINFO_LEVEL_NORMAL)
opts->x_debug_info_level = DINFO_LEVEL_NORMAL;
}
else