[PATCH] fix more -Wformat-diag issues

Martin Sebor msebor@gmail.com
Thu Jun 6 14:46:00 GMT 2019


On 6/6/19 3:39 AM, Jakub Jelinek wrote:
> On Wed, May 22, 2019 at 10:34:00AM -0600, Martin Sebor wrote:
>> gcc/ChangeLog:
>>
>> 	* config/i386/i386-features.c (ix86_get_function_versions_dispatcher):
>> 	Adjust quoting and hyphenation.
>> 	* convert.c (convert_to_real_1): Same.
>> 	* gcc.c (driver_wrong_lang_callback): Same.
>> 	(driver::handle_unrecognized_options): Same.
>> 	* gimple-ssa-nonnull-compare.c (do_warn_nonnull_compare): Same.
>> 	* opts-common.c (cmdline_handle_error): Same.
>> 	(read_cmdline_option): Same.
>> 	* opts-global.c (complain_wrong_lang): Same.
>> 	(print_ignored_options): Same.
>> 	(handle_common_deferred_options): Same.
>> 	* pretty-print.h: Same.
>> 	* print-rtl.c (debug_bb_n_slim): Same.
>> 	* sched-rgn.c (make_pass_sched_fusion): Same.
>> 	* tree-cfg.c (verify_gimple_assign_unary): Same.
>> 	(verify_gimple_label): Same.
>> 	* tree-ssa-operands.c (verify_ssa_operands): Same.
>> 	* varasm.c (do_assemble_alias): Same.
>> 	(assemble_alias): Same.
>>
>> 	* diagnostic-core.h (GCC_DIAG_STYLE): Adjust.
>> 	 (GCC_DIAG_RAW_STYLE): New macro.
>>
>> 	* cfghooks.c: Disable -Wformat-diags.
>> 	* cfgloop.c: Same.
>> 	* cfgrtl.c: Same.
>> 	* cgraph.c: Same.
>> 	* diagnostic-show-locus.c: Same.
>> 	* diagnostic.c: Same.
>> 	* gimple-pretty-print.c: Same.
>> 	* graph.c: Same.
>> 	* symtab.c: Same.
>> 	* tree-eh.c Same.
>> 	* tree-pretty-print.c: Same.
>> 	* tree-ssa.c: Same.
>>
>> 	* configure: Regenerate.
>> 	* configure.ac (ACX_PROG_CXX_WARNING_OPTS): Add -Wno-error=format-diag.
>> 	 (ACX_PROG_CC_WARNING_OPTS): Same.
> 
> Changes for the same change shouldn't be separated by empty newlines in the
> ChangeLog.  Furthermore, you've managed to commit only the first part (until
> varasm.c) and not the rest.

I actually managed to do that on purpose.  I just didn't "manage"
to also update the ever important ChangeLog.  There are probably
other mistakes in it.

> 
>> diff --git a/gcc/configure b/gcc/configure
>> index 4a3d5eefcb8..c9062cca9d6 100755
>> --- a/gcc/configure
>> +++ b/gcc/configure
>> @@ -6797,7 +6797,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
>>   
>>   c_loose_warn=
>>   save_CFLAGS="$CFLAGS"
>> -for real_option in -Wstrict-prototypes -Wmissing-prototypes; do
>> +for real_option in -Wstrict-prototypes -Wmissing-prototypes-Wno-error=format-diag; do
>>     # Do the check with the no- prefix removed since gcc silently
>>     # accepts any -Wno-* option on purpose
>>     case $real_option in
> 
> The above was probably regenerated before you've added a space:

Yes.

> 
>> diff --git a/gcc/configure.ac b/gcc/configure.ac
>> index 35982fdc9ed..cbc0c25fa2b 100644
>> --- a/gcc/configure.ac
>> +++ b/gcc/configure.ac
>> @@ -483,10 +483,11 @@ AS_IF([test $enable_build_format_warnings = no],
>>         [wf_opt=-Wno-format],[wf_opt=])
>>   ACX_PROG_CXX_WARNING_OPTS(
>>   	m4_quote(m4_do([-W -Wall -Wno-narrowing -Wwrite-strings ],
>> -		       [-Wcast-qual $wf_opt])), [loose_warn])
>> +		       [-Wcast-qual -Wno-error=format-diag $wf_opt])),
>> +		       [loose_warn])
>>   ACX_PROG_CC_WARNING_OPTS(
>> -	m4_quote(m4_do([-Wstrict-prototypes -Wmissing-prototypes])),
>> -	[c_loose_warn])
>> +	m4_quote(m4_do([-Wstrict-prototypes -Wmissing-prototypes ],
> 
>                                                                  ^--HERE
> I've committed following to fix that up as obvious:

Thank you.

Martin

> 
> 2019-06-06  Jakub Jelinek  <jakub@redhat.com>
> 
> 	* configure: Regenerate.
> 
> --- gcc/configure	(revision 271993)
> +++ gcc/configure	(revision 271994)
> @@ -6797,7 +6797,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
>   
>   c_loose_warn=
>   save_CFLAGS="$CFLAGS"
> -for real_option in -Wstrict-prototypes -Wmissing-prototypes-Wno-error=format-diag; do
> +for real_option in -Wstrict-prototypes -Wmissing-prototypes -Wno-error=format-diag; do
>     # Do the check with the no- prefix removed since gcc silently
>     # accepts any -Wno-* option on purpose
>     case $real_option in
> 
> 
> 	Jakub
> 



More information about the Gcc-patches mailing list