On Tue, 6 Oct 2020, Jakub Jelinek wrote: > Hi! > > On Tue, Oct 06, 2020 at 11:28:22AM +0200, Andreas Schwab wrote: > > options-save.c: In function 'void cl_target_option_save(cl_target_option*, > > gcc_options*, gcc_options*)': > > options-save.c:8526:26: error: unused variable 'mask' > > [-Werror=unused-variable] > > 8526 | unsigned HOST_WIDE_INT mask = 0; > > | ^~~~ > > options-save.c: In function 'void cl_target_option_restore(gcc_options*, > > gcc_options*, cl_target_option*)': > > options-save.c:8537:26: error: unused variable 'mask' > > [-Werror=unused-variable] > > 8537 | unsigned HOST_WIDE_INT mask; > > | ^~~~ > > Oops, missed that, sorry. > > The following patch should fix that, tested on x86_64-linux make > options-save.c (same file as before) and -> ia64-linux cross make > options-save.o (no warning anymore, just the unwanted declarations gone). > > Ok for trunk if it passes bootstrap/regtest?
OK. Richard. > 2020-10-06 Jakub Jelinek <ja...@redhat.com> > > PR bootstrap/97305 > * optc-save-gen.awk: Don't declare mask variable if explicit_mask > array is not present. > > --- gcc/optc-save-gen.awk.jj 2020-10-05 09:34:26.561874335 +0200 > +++ gcc/optc-save-gen.awk 2020-10-06 14:44:04.679556591 +0200 > @@ -597,11 +597,13 @@ for (i = 0; i < n_target_string; i++) { > } > > print ""; > -print " unsigned HOST_WIDE_INT mask = 0;"; > > j = 0; > k = 0; > for (i = 0; i < n_extra_target_vars; i++) { > + if (j == 0 && k == 0) { > + print " unsigned HOST_WIDE_INT mask = 0;"; > + } > print " if (opts_set->x_" extra_target_vars[i] ") mask |= > HOST_WIDE_INT_1U << " j ";"; > j++; > if (j == 64) { > @@ -617,6 +619,9 @@ for (i = 0; i < n_target_other; i++) { > print " ptr->explicit_mask_" var_target_other[i] " = > opts_set->x_" var_target_other[i] ";"; > continue; > } > + if (j == 0 && k == 0) { > + print " unsigned HOST_WIDE_INT mask = 0;"; > + } > print " if (opts_set->x_" var_target_other[i] ") mask |= > HOST_WIDE_INT_1U << " j ";"; > j++; > if (j == 64) { > @@ -628,6 +633,9 @@ for (i = 0; i < n_target_other; i++) { > } > > for (i = 0; i < n_target_enum; i++) { > + if (j == 0 && k == 0) { > + print " unsigned HOST_WIDE_INT mask = 0;"; > + } > print " if (opts_set->x_" var_target_enum[i] ") mask |= > HOST_WIDE_INT_1U << " j ";"; > j++; > if (j == 64) { > @@ -643,6 +651,9 @@ for (i = 0; i < n_target_int; i++) { > print " ptr->explicit_mask_" var_target_int[i] " = > opts_set->x_" var_target_int[i] ";"; > continue; > } > + if (j == 0 && k == 0) { > + print " unsigned HOST_WIDE_INT mask = 0;"; > + } > print " if (opts_set->x_" var_target_int[i] ") mask |= > HOST_WIDE_INT_1U << " j ";"; > j++; > if (j == 64) { > @@ -654,6 +665,9 @@ for (i = 0; i < n_target_int; i++) { > } > > for (i = 0; i < n_target_short; i++) { > + if (j == 0 && k == 0) { > + print " unsigned HOST_WIDE_INT mask = 0;"; > + } > print " if (opts_set->x_" var_target_short[i] ") mask |= > HOST_WIDE_INT_1U << " j ";"; > j++; > if (j == 64) { > @@ -665,6 +679,9 @@ for (i = 0; i < n_target_short; i++) { > } > > for (i = 0; i < n_target_char; i++) { > + if (j == 0 && k == 0) { > + print " unsigned HOST_WIDE_INT mask = 0;"; > + } > print " if (opts_set->x_" var_target_char[i] ") mask |= > HOST_WIDE_INT_1U << " j ";"; > j++; > if (j == 64) { > @@ -676,6 +693,9 @@ for (i = 0; i < n_target_char; i++) { > } > > for (i = 0; i < n_target_string; i++) { > + if (j == 0 && k == 0) { > + print " unsigned HOST_WIDE_INT mask = 0;"; > + } > print " if (opts_set->x_" var_target_string[i] ") mask |= > HOST_WIDE_INT_1U << " j ";"; > j++; > if (j == 64) { > @@ -732,7 +752,9 @@ for (i = 0; i < n_target_string; i++) { > } > > print ""; > -print " unsigned HOST_WIDE_INT mask;"; > +if (has_target_explicit_mask) { > + print " unsigned HOST_WIDE_INT mask;"; > +} > > j = 64; > k = 0; > > > Jakub > > -- Richard Biener <rguent...@suse.de> SUSE Software Solutions Germany GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany; GF: Felix Imend