revert: re PR driver/61106 ([4.8/4.9] impliedness of -Wunused-parameter depends on...

gcc/

2014-05-14  Matthias Klose  <doko@ubuntu.com>

	Revert:
	2014-05-08  Manuel López-Ibáñez  <manu@gcc.gnu.org>
		    Matthias Klose  <doko@ubuntu.com>

	PR driver/61106
	* optc-gen.awk: Fix option handling for -Wunused-parameter.

gcc/testsuite/

2014-05-14  Matthias Klose  <doko@ubuntu.com>

	PR driver/61106
	* gcc-dg/unused-8a.c: Remove.

From-SVN: r210432

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 27052a692aff723d337229c9d2ee353007e4b0be..acd5a242c782e8f7eb369d9271d0a726d2fce7ba 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2014-05-14  Matthias Klose  <doko@ubuntu.com>
+
+       Revert:
+       2014-05-08  Manuel López-Ibáñez  <manu@gcc.gnu.org>
+                   Matthias Klose  <doko@ubuntu.com>
+
+       PR driver/61106
+       * optc-gen.awk: Fix option handling for -Wunused-parameter.
+
 2014-05-13  Peter Bergner  <bergner@vnet.ibm.com>
 
        * doc/sourcebuild.texi: (dfp_hw): Document.

diff --git a/gcc/optc-gen.awk b/gcc/optc-gen.awk
index c55157e741fe16066e27abdaf49fa4db982471f7..738cb5a26a7e594903c93133a91c945626de292e 100644 (file)
--- 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 9b2d8be06088ad92e5c7e7f99b24722e8409df71..797bd1aedf8ae5516ed651144b3cab64d4f1fa7d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-14  Matthias Klose  <doko@ubuntu.com>
+
+       PR driver/61106
+       * gcc-dg/unused-8a.c: Remove.
+
 2014-05-13  Peter Bergner  <bergner@vnet.ibm.com>
 
        * 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 (file)
index b9b5690..0000000
--- 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) { }