# DP: Proposed patch for PR driver/61126.

Index: b/src/gcc/fortran/lang.opt
===================================================================
--- a/src/gcc/fortran/lang.opt
+++ b/src/gcc/fortran/lang.opt
@@ -293,6 +293,10 @@
 Fortran Warning
 Warn about unused dummy arguments.
 
+Wunused-parameter
+LangEnabledBy(Fortran,Wextra)
+; Documented in common.opt
+
 cpp
 Fortran Negative(nocpp)
 Enable preprocessing
Index: b/src/gcc/fortran/options.c
===================================================================
--- a/src/gcc/fortran/options.c
+++ b/src/gcc/fortran/options.c
@@ -658,12 +658,7 @@
       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:
Index: b/src/gcc/opts-global.c
===================================================================
--- a/src/gcc/opts-global.c
+++ b/src/gcc/opts-global.c
@@ -301,10 +301,10 @@
   handlers->unknown_option_callback = unknown_option_callback;
   handlers->wrong_lang_callback = complain_wrong_lang;
   handlers->num_handlers = 3;
-  handlers->handlers[0].handler = lang_handle_option;
-  handlers->handlers[0].mask = initial_lang_mask;
-  handlers->handlers[1].handler = common_handle_option;
-  handlers->handlers[1].mask = CL_COMMON;
+  handlers->handlers[0].handler = common_handle_option;
+  handlers->handlers[0].mask = CL_COMMON;
+  handlers->handlers[1].handler = lang_handle_option;
+  handlers->handlers[1].mask = initial_lang_mask;
   handlers->handlers[2].handler = target_handle_option;
   handlers->handlers[2].mask = CL_TARGET;
 }