From 5137d1ae6a1fe4a3ff8b5983f6e4d9aeb69e5486 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Fri, 11 Dec 2020 17:06:49 +0100 Subject: [PATCH] Remove Report keyword for options Since g:7caa49706316e650fb67719e1a1bf3a35054b685 the option is ignored as we print used command line for -fverbose-asm output. gcc/ChangeLog: * doc/options.texi: Remove Report keyword. * opt-functions.awk: Print error when Report keyword is used. * optc-gen.awk: Do not handle Report keyword. * opts.h (struct cl_option): Remove cl_report bitfield flag. --- gcc/doc/options.texi | 3 --- gcc/opt-functions.awk | 4 +++- gcc/optc-gen.awk | 4 ---- gcc/opts.h | 2 -- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/gcc/doc/options.texi b/gcc/doc/options.texi index a8e83fcb696..aabfb82c7cb 100644 --- a/gcc/doc/options.texi +++ b/gcc/doc/options.texi @@ -454,9 +454,6 @@ operands, which is passed to the @samp{warning} function. If an alias is marked @code{Warn}, the target of the alias must not also be marked @code{Warn}. -@item Report -The state of the option should be printed by @option{-fverbose-asm}. - @item Warning This is a warning option and should be shown as such in @option{--help} output. This flag does not currently affect anything diff --git a/gcc/opt-functions.awk b/gcc/opt-functions.awk index b4952b89315..0c489e0e3be 100644 --- a/gcc/opt-functions.awk +++ b/gcc/opt-functions.awk @@ -166,9 +166,11 @@ function switch_bit_fields (flags) uinteger_flag \ hwi_flag \ flag_init("ToLower", flags) \ - flag_init("Report", flags) \ byte_size_flag + if (flag_set_p("Report", flags)) + print "#error Report option property is dropped" + sub(", $", "", result) return result } diff --git a/gcc/optc-gen.awk b/gcc/optc-gen.awk index be5566b960a..0c9fa16cb00 100644 --- a/gcc/optc-gen.awk +++ b/gcc/optc-gen.awk @@ -332,8 +332,6 @@ for (i = 0; i < n_opts; i++) { print "#error Ignored option with Warn" if (var_name(flags[i]) != "") print "#error Ignored option with Var" - if (flag_set_p("Report", flags[i])) - print "#error Ignored option with Report" } else if (flag_set_p("Deprecated", flags[i])) print "#error Deprecated was replaced with WarnRemoved" @@ -341,8 +339,6 @@ for (i = 0; i < n_opts; i++) { alias_data = "NULL, NULL, OPT_SPECIAL_warn_removed" if (warn_message != "NULL") print "#error WarnRemoved option with Warn" - if (flag_set_p("Report", flags[i])) - print "#error WarnRemoved option with Report" } else alias_data = "NULL, NULL, N_OPTS" diff --git a/gcc/opts.h b/gcc/opts.h index b36c0d18759..2cf24d1430d 100644 --- a/gcc/opts.h +++ b/gcc/opts.h @@ -104,8 +104,6 @@ struct cl_option BOOL_BITFIELD cl_host_wide_int : 1; /* Argument should be converted to lowercase. */ BOOL_BITFIELD cl_tolower : 1; - /* Report argument with -fverbose-asm */ - BOOL_BITFIELD cl_report : 1; /* Argument is an unsigned integer with an optional byte suffix. */ BOOL_BITFIELD cl_byte_size: 1; /* Offset of field for this option in struct gcc_options, or -- 2.30.2