← Back to branch summary

~angelsl/ubuntu/wily/gcc-5/mips-cross

« back to all changes in this revision

Viewing changes to debian/patches/pr61126.diff

  • Committer: angelsl
  • Date: 2015-10-30 03:30:35 UTC
  • Revision ID: angelsl-20151030033035-rmug41zm8hyjgisg
Original import

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/pr61126.diff
 
1
Index: gcc/fortran/lang.opt
 
2
===================================================================
 
3
--- a/src/gcc/fortran/lang.opt  (revision 210277)
 
4
+++ b/src/gcc/fortran/lang.opt  (working copy)
 
5
@@ -301,6 +301,10 @@
 
6
 Fortran Warning
 
7
 Warn about unused dummy arguments.
 
8
 
 
9
+Wunused-parameter
 
10
+LangEnabledBy(Fortran,Wextra)
 
11
+; Documented in common.opt
 
12
+
 
13
 Wzerotrip
 
14
 Fortran Warning
 
15
 Warn about zero-trip DO loops
 
16
Index: gcc/fortran/options.c
 
17
===================================================================
 
18
--- a/src/gcc/fortran/options.c (revision 210277)
 
19
+++ b/src/gcc/fortran/options.c (working copy)
 
20
@@ -674,12 +674,7 @@
 
21
       break;
 
22
 
 
23
     case OPT_Wextra:
 
24
-      handle_generated_option (&global_options, &global_options_set,
 
25
-                              OPT_Wunused_parameter, NULL, value,
 
26
-                              gfc_option_lang_mask (), kind, loc,
 
27
-                              handlers, global_dc);
 
28
       set_Wextra (value);
 
29
-
 
30
       break;
 
31
 
 
32
     case OPT_Wfunction_elimination:
 
33
Index: gcc/opts-global.c
 
34
===================================================================
 
35
--- a/src/gcc/opts-global.c     (revision 210277)
 
36
+++ b/src/gcc/opts-global.c     (working copy)
 
37
@@ -273,10 +273,10 @@
 
38
   handlers->unknown_option_callback = unknown_option_callback;
 
39
   handlers->wrong_lang_callback = complain_wrong_lang;
 
40
   handlers->num_handlers = 3;
 
41
-  handlers->handlers[0].handler = lang_handle_option;
 
42
-  handlers->handlers[0].mask = initial_lang_mask;
 
43
-  handlers->handlers[1].handler = common_handle_option;
 
44
-  handlers->handlers[1].mask = CL_COMMON;
 
45
+  handlers->handlers[0].handler = common_handle_option;
 
46
+  handlers->handlers[0].mask = CL_COMMON;
 
47
+  handlers->handlers[1].handler = lang_handle_option;
 
48
+  handlers->handlers[1].mask = initial_lang_mask;
 
49
   handlers->handlers[2].handler = target_handle_option;
 
50
   handlers->handlers[2].mask = CL_TARGET;
 
51
 }