From: manu <manu@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 16 May 2010 10:30:39 +0000 (+0000)
Subject: 2010-05-16  Manuel López-Ibáñez  <manu@gcc.gnu.org>
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6bda7b348821bfd40d1be3d14ca3452a5163ceaa;p=pf3gnuchains%2Fgcc-fork.git

2010-05-16  Manuel López-Ibáñez  <manu@gcc.gnu.org>

ada/
	* gcc-interface/misc.c (gnat_handle_option): Remove special logic
	for Wuninitialized without -O.
fortran/
	* options.c (set_Wall): Remove special logic for Wuninitialized
	without -O.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159454 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index b70056b77a8..20ca27a0646 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-16  Manuel López-Ibáñez  <manu@gcc.gnu.org>
+
+	* gcc-interface/misc.c (gnat_handle_option): Remove special logic
+	for Wuninitialized without -O.
+	
 2010-05-16  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gcc-interface/gigi.h (enum standard_datatypes): Add new value
diff --git a/gcc/ada/gcc-interface/misc.c b/gcc/ada/gcc-interface/misc.c
index c8193f37b8a..0f85393d956 100644
--- a/gcc/ada/gcc-interface/misc.c
+++ b/gcc/ada/gcc-interface/misc.c
@@ -209,12 +209,7 @@ gnat_handle_option (size_t scode, const char *arg, int value,
 
     case OPT_Wall:
       warn_unused = value;
-
-      /* We save the value of warn_uninitialized, since if they put
-	 -Wuninitialized on the command line, we need to generate a
-	 warning about not using it without also specifying -O.  */
-      if (warn_uninitialized != 1)
-	warn_uninitialized = (value ? 2 : 0);
+      warn_uninitialized = value;
       break;
 
       /* These are used in the GCC Makefile.  */
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 2b2bc9bfb57..a8879acb460 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-16  Manuel López-Ibáñez  <manu@gcc.gnu.org>
+
+	* options.c (set_Wall): Remove special logic for Wuninitialized
+	without -O.
+
 2010-05-15  Janus Weil  <janus@gcc.gnu.org>
 
 	PR fortran/44154
diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index 28c91147534..6a5a3db6f3b 100644
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.c
@@ -413,14 +413,7 @@ set_Wall (int setting)
   warn_unused = setting;
   warn_return_type = setting;
   warn_switch = setting;
-
-  /* We save the value of warn_uninitialized, since if they put
-     -Wuninitialized on the command line, we need to generate a
-     warning about not using it without also specifying -O.  */
-  if (setting == 0)
-    warn_uninitialized = 0;
-  else if (warn_uninitialized != 1)
-    warn_uninitialized = 2;
+  warn_uninitialized = setting;
 }