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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@210434 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/ChangeLog

+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.

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"

gcc/testsuite/ChangeLog

+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.

gcc/testsuite/gcc.dg/unused-8a.c

-/* { dg-do compile } */
-/* { dg-options "-Wall -Wextra -Wno-unused" } */
-
-void foo(int x) { }