From a2da0476247735a30b2d72d11d3dd691e78aabc5 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@gcc.gnu.org>
Date: Thu, 8 May 2014 22:57:55 +0000
Subject: [PATCH] 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-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-08  Matthias Klose  <doko@ubuntu.com>

        PR driver/61106
        * gcc-dg/unused-8a.c: New.
        * gcc-dg/unused-8b.c: Likewise.

From-SVN: r210248
---
 gcc/ChangeLog                    | 6 ++++++
 gcc/optc-gen.awk                 | 6 ++++--
 gcc/testsuite/ChangeLog          | 6 ++++++
 gcc/testsuite/gcc.dg/unused-8a.c | 4 ++++
 gcc/testsuite/gcc.dg/unused-8b.c | 4 ++++
 5 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/unused-8a.c
 create mode 100644 gcc/testsuite/gcc.dg/unused-8b.c

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7127255fa2af..1de14a0691c7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+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-08  Uros Bizjak  <ubizjak@gmail.com>
 
 	PR target/59952
diff --git a/gcc/optc-gen.awk b/gcc/optc-gen.awk
index 738cb5a26a7e..c55157e741fe 100644
--- a/gcc/optc-gen.awk
+++ b/gcc/optc-gen.awk
@@ -406,11 +406,13 @@ for (i = 0; i < n_enabledby; i++) {
         if (opt_var_name != "") {
             condition = "!opts_set->x_" opt_var_name
             if (thisenableif[j] != "") {
-                condition = condition " && (" thisenableif[j] ")"
+                value = "(" thisenableif[j] ")"
+            } else {
+                value = "value"
             }
             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 9fa27bafe7ba..3dd50b90eb14 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-08  Matthias Klose  <doko@ubuntu.com>
+
+	PR driver/61106
+	* gcc-dg/unused-8a.c: New.
+	* gcc-dg/unused-8b.c: Likewise.
+
 2014-05-07  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/57864
diff --git a/gcc/testsuite/gcc.dg/unused-8a.c b/gcc/testsuite/gcc.dg/unused-8a.c
new file mode 100644
index 000000000000..b9b569051569
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/unused-8a.c
@@ -0,0 +1,4 @@
+/* { dg-do compile } */
+/* { dg-options "-Wall -Wextra -Wno-unused" } */
+
+void foo(int x) { }
diff --git a/gcc/testsuite/gcc.dg/unused-8b.c b/gcc/testsuite/gcc.dg/unused-8b.c
new file mode 100644
index 000000000000..5b4b894937cd
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/unused-8b.c
@@ -0,0 +1,4 @@
+/* { dg-do compile } */
+/* { dg-options "-Wall -Wno-unused -Wextra" } */
+
+void foo(int x) { }
-- 
2.47.2