summaryrefslogtreecommitdiff
path: root/gcc/c-family
diff options
context:
space:
mode:
authorbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2012-05-29 11:15:27 +0000
committerbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2012-05-29 11:15:27 +0000
commit3bc7521a3c29a77cbd5e5247d3e474c07d628ae6 (patch)
tree05e6cc55deff5f86a6391e8a7be37e25bc5871e6 /gcc/c-family
parentc1f70dd1d4fb1f6b0b16421a95b173c2f73abc91 (diff)
downloadgcc-3bc7521a3c29a77cbd5e5247d3e474c07d628ae6.tar.gz
2012-05-29 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 187948 using svnmerge git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@187951 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/c-family')
-rw-r--r--gcc/c-family/ChangeLog12
-rw-r--r--gcc/c-family/c-opts.c1
-rw-r--r--gcc/c-family/c.opt2
3 files changed, 13 insertions, 2 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index b71174d1863..650302b0e93 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,15 @@
+2012-05-29 Manuel López-Ibáñez <manu@gcc.gnu.org>
+
+ * c.opt (Wmissing-braces): Use LangEnabledBy(C ObjC,Wall).
+ * c-opts.c (c_common_handle_option): Remove code handling
+ warn_missing_braces.
+
+2012-05-28 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR c++/25137
+ * c-opts.c (c_common_handle_option): For C++ -Wall doesn't enable
+ -Wmissing_braces.
+
2012-05-22 Dodji Seketeli <dodji@redhat.com>
PR c++/53322
diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
index c493c1096f3..2330c133292 100644
--- a/gcc/c-family/c-opts.c
+++ b/gcc/c-family/c-opts.c
@@ -370,7 +370,6 @@ c_common_handle_option (size_t scode, const char *arg, int value,
c_family_lang_mask, kind, loc,
handlers, global_dc);
warn_char_subscripts = value;
- warn_missing_braces = value;
warn_parentheses = value;
warn_return_type = value;
warn_sequence_point = value; /* Was C only. */
diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
index 0b72d79ae91..c5daf754b3c 100644
--- a/gcc/c-family/c.opt
+++ b/gcc/c-family/c.opt
@@ -463,7 +463,7 @@ C ObjC C++ ObjC++ Var(warn_main) Init(-1) Warning
Warn about suspicious declarations of \"main\"
Wmissing-braces
-C ObjC C++ ObjC++ Var(warn_missing_braces) Warning
+C ObjC C++ ObjC++ Var(warn_missing_braces) Warning LangEnabledBy(C ObjC,Wall)
Warn about possibly missing braces around initializers
Wmissing-declarations