[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

gcc/fortran/ChangeLog

+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):

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:

gcc/testsuite/ChangeLog

+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>
 

gcc/testsuite/gfortran.dg/wextra_1.f

 ! { dg-do compile }
-! { dg-options "-Wextra" }
+! { dg-options "-Wall -Wextra" }
       program main
       integer, parameter :: x=3 ! { dg-warning "Unused parameter" }
       real :: a