From fa36ce9c63a6a7531df13300a41483ac7e3268fa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Manuel=20L=C3=B3pez-Ib=C3=A1=C3=B1ez?= Date: Sun, 16 May 2010 10:30:39 +0000 Subject: [PATCH] misc.c (gnat_handle_option): Remove special logic for Wuninitialized without -O. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2010-05-16 Manuel López-Ibáñez 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. From-SVN: r159454 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/gcc-interface/misc.c | 7 +------ gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/options.c | 9 +-------- 4 files changed, 12 insertions(+), 14 deletions(-) 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 + + * gcc-interface/misc.c (gnat_handle_option): Remove special logic + for Wuninitialized without -O. + 2010-05-16 Eric Botcazou * 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 + + * options.c (set_Wall): Remove special logic for Wuninitialized + without -O. + 2010-05-15 Janus Weil 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; } -- 2.30.2