From d69daf0ee6c749e0da1c47f53b1aa035b86b0d1e Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Wed, 14 May 2014 16:18:12 +0000 Subject: [PATCH] revert: re PR driver/61106 ([4.8/4.9] impliedness of -Wunused-parameter depends on -W option ordering) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit gcc/ 2014-05-14 Matthias Klose Revert: 2014-05-08 Manuel López-Ibáñez Matthias Klose PR driver/61106 * optc-gen.awk: Fix option handling for -Wunused-parameter. gcc/testsuite/ 2014-05-14 Matthias Klose PR driver/61106 * gcc-dg/unused-8a.c: Remove. From-SVN: r210432 --- gcc/ChangeLog | 9 +++++++++ gcc/optc-gen.awk | 6 ++---- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/unused-8a.c | 4 ---- 4 files changed, 16 insertions(+), 8 deletions(-) delete mode 100644 gcc/testsuite/gcc.dg/unused-8a.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 27052a692aff..acd5a242c782 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2014-05-14 Matthias Klose + + Revert: + 2014-05-08 Manuel López-Ibáñez + Matthias Klose + + PR driver/61106 + * optc-gen.awk: Fix option handling for -Wunused-parameter. + 2014-05-13 Peter Bergner * doc/sourcebuild.texi: (dfp_hw): Document. diff --git a/gcc/optc-gen.awk b/gcc/optc-gen.awk index c55157e741fe..738cb5a26a7e 100644 --- a/gcc/optc-gen.awk +++ b/gcc/optc-gen.awk @@ -406,13 +406,11 @@ for (i = 0; i < n_enabledby; i++) { if (opt_var_name != "") { condition = "!opts_set->x_" opt_var_name if (thisenableif[j] != "") { - value = "(" thisenableif[j] ")" - } else { - value = "value" + condition = condition " && (" thisenableif[j] ")" } print " if (" condition ")" print " handle_generated_option (opts, opts_set," - print " " opt_enum(thisenable[j]) ", NULL, " value "," + print " " opt_enum(thisenable[j]) ", NULL, value," print " lang_mask, kind, loc, handlers, dc);" } else { print "#error " thisenable[j] " does not have a Var() flag" diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9b2d8be06088..797bd1aedf8a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-05-14 Matthias Klose + + PR driver/61106 + * gcc-dg/unused-8a.c: Remove. + 2014-05-13 Peter Bergner * lib/target-support.exp (check_dfp_hw_available): New function. diff --git a/gcc/testsuite/gcc.dg/unused-8a.c b/gcc/testsuite/gcc.dg/unused-8a.c deleted file mode 100644 index b9b569051569..000000000000 --- a/gcc/testsuite/gcc.dg/unused-8a.c +++ /dev/null @@ -1,4 +0,0 @@ -/* { dg-do compile } */ -/* { dg-options "-Wall -Wextra -Wno-unused" } */ - -void foo(int x) { } -- 2.47.2