From 7f420d0d6459fdef0017363d95837cdaee9384fa Mon Sep 17 00:00:00 2001
From: Gabriel Dos Reis <gdr@integrable-solutions.net>
Date: Mon, 20 Nov 2006 01:03:49 +0000
Subject: [PATCH] re PR c++/8586 (-Wwrite-strings should be included in -Wall)

2006-11-19  Gabriel Dos Reis  <gdr@integrable-solutions.net>

        PR c++/8586
        * c-opts.c (c_common_handle_option): Enable -Wwrite-strings if
        -Wall.

testsuite/
2006-11-19  Gabriel Dos Reis  <gdr@integrable-solutions.net>

        PR c++/8586
        * g++.dg/warn/Wall-write-strings.C: New.

From-SVN: r119009
---
 gcc/ChangeLog                                  | 5 +++++
 gcc/c-opts.c                                   | 2 ++
 gcc/testsuite/ChangeLog                        | 5 +++++
 gcc/testsuite/g++.dg/warn/Wall-write-strings.C | 7 +++++++
 4 files changed, 19 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/warn/Wall-write-strings.C

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4af29a58294..4496ea2f6d7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-19  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	PR c++/8586
+	* c-opts.c (c_common_handle_option): Enable -Wwrite-strings if -Wall.
+
 2006-11-19  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
 	PR target/29114
diff --git a/gcc/c-opts.c b/gcc/c-opts.c
index 1abb374c476..36026fd869b 100644
--- a/gcc/c-opts.c
+++ b/gcc/c-opts.c
@@ -416,6 +416,8 @@ c_common_handle_option (size_t scode, const char *arg, int value)
 	  /* C++-specific warnings.  */
 	  warn_reorder = value;
 	  warn_nontemplate_friend = value;
+          if (value > 0)
+            warn_write_strings = true;
 	}
 
       cpp_opts->warn_trigraphs = value;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a44c291307f..f014dbb6f04 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-19  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	PR c++/8586
+	* g++.dg/warn/Wall-write-strings.C: New.
+
 2006-11-19  Erik Edelmann  <eedelman@gcc.gnu.org>
 
 	* gfortran.dg/alloc_comp_constraint_5.f90: New.
diff --git a/gcc/testsuite/g++.dg/warn/Wall-write-strings.C b/gcc/testsuite/g++.dg/warn/Wall-write-strings.C
new file mode 100644
index 00000000000..e380b321bcd
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wall-write-strings.C
@@ -0,0 +1,7 @@
+// PR 8586
+// { dg-do compile }
+// { dg-options "-Wall" }
+
+char* foo = "foo";              // { dg-warning "" }
+const char* bar = "bar";
+
-- 
2.11.4.GIT