[multiple changes]

2014-06-18  Manuel López-Ibáñez  <manu@gcc.gnu.org>

        PR fortran/61126
        * options.c (gfc_handle_option): Remove call to
        handle_generated_option.

2014-06-18  Dominique d'Humieres <dominiq@lps.ens.fr>

        PR fortran/61126
        * gfortran.dg/wextra_1.f: Add -Wall to dg-options.

From-SVN: r211766

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 262858d6edfd3bbe29720debcfb5d2e668dda1cd..fefa81b03a265f91a27b986366f9024a10377079 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-18  Manuel López-Ibáñez  <manu@gcc.gnu.org>
+
+       PR fortran/61126
+       * options.c (gfc_handle_option): Remove call to
+       handle_generated_option.
+
 2014-06-17  Tobias Burnus  <burnus@net-b.de>
 
        * check.c (gfc_check_atomic, gfc_check_atomic_def):

diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index a2b91ca0aceea86d70f586c6752660f386a22dbe..e4931f0754b6f3bcb8f1fa5d5d5e21391ba898a3 100644 (file)
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.c
@@ -674,12 +674,7 @@ gfc_handle_option (size_t scode, const char *arg, int value,
       break;
 
     case OPT_Wextra:
-      handle_generated_option (&global_options, &global_options_set,
-                              OPT_Wunused_parameter, NULL, value,
-                              gfc_option_lang_mask (), kind, loc,
-                              handlers, global_dc);
       set_Wextra (value);
-
       break;
 
     case OPT_Wfunction_elimination:

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 560f45abdeea882f5b3c90f8a775137096cb7ed5..80c4e2afbd0ec89148a6421d56a9f2199f4df2ea 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-18  Dominique d'Humieres <dominiq@lps.ens.fr>
+
+       PR fortran/61126
+       * gfortran.dg/wextra_1.f: Add -Wall to dg-options.
+
 2014-06-17  Tobias Burnus  <burnus@net-b.de>
            Alessandro Fanfarillo <alessandro.fanfarillo@gmail.com>
 

diff --git a/gcc/testsuite/gfortran.dg/wextra_1.f b/gcc/testsuite/gfortran.dg/wextra_1.f
index 94c8eddec097efeb15d05455093bab9d4bcc036e..0eb28e1999937fcd7e998763a49b2b749e977ab4 100644 (file)
--- a/gcc/testsuite/gfortran.dg/wextra_1.f
+++ b/gcc/testsuite/gfortran.dg/wextra_1.f
@@ -1,5 +1,5 @@
 ! { dg-do compile }
-! { dg-options "-Wextra" }
+! { dg-options "-Wall -Wextra" }
       program main
       integer, parameter :: x=3 ! { dg-warning "Unused parameter" }
       real :: a