opts.h (finish_options): Remove lang_mask argument.

	* opts.h (finish_options): Remove lang_mask argument.
	(print_help, help_option_argument): Declare.
	* opts.c (print_help): Remove forward declaration, no longer static.
	(finish_options): Remove lang_mask argument, don't call print_help
	here.
	* opts-global.c (decode_options): Adjust finish_option caller, call
	print_help here.

From-SVN: r270836

4 files changed, 19 insertions, 11 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2c4150d83e4..346cb5f5ad6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,13 @@
 2019-05-03  Jakub Jelinek  <jakub@redhat.com>
 
+	* opts.h (finish_options): Remove lang_mask argument.
+	(print_help, help_option_argument): Declare.
+	* opts.c (print_help): Remove forward declaration, no longer static.
+	(finish_options): Remove lang_mask argument, don't call print_help
+	here.
+	* opts-global.c (decode_options): Adjust finish_option caller, call
+	print_help here.
+
 	PR tree-optimization/90303
 	* ipa-devirt.c (obj_type_ref_class, get_odr_type): Don't use
 	TYPE_CANONICAL for TYPE_STRUCTURAL_EQUALITY_P types in !in_lto_p mode.
diff --git a/gcc/opts-global.c b/gcc/opts-global.c
index f110fe1026f..e6eaeb20bf7 100644
--- a/gcc/opts-global.c
+++ b/gcc/opts-global.c
@@ -314,7 +314,11 @@ decode_options (struct gcc_options *opts, struct gcc_options *opts_set,
 			loc, lang_mask,
 			&handlers, dc);
 
-  finish_options (opts, opts_set, loc, lang_mask);
+  finish_options (opts, opts_set, loc);
+
+  /* Print --help=* if used.  */
+  if (help_option_argument != NULL)
+    print_help (opts, lang_mask);
 }
 
 /* Hold command-line options associated with stack limitation.  */
diff --git a/gcc/opts.c b/gcc/opts.c
index 286bb8f5402..71adc21cb26 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -858,15 +858,13 @@ control_options_for_live_patching (struct gcc_options *opts,
 /* --help option argument if set.  */
 const char *help_option_argument = NULL;
 
-static void print_help (struct gcc_options *opts, unsigned int lang_mask);
-
 
 /* After all options at LOC have been read into OPTS and OPTS_SET,
    finalize settings of those options and diagnose incompatible
    combinations.  */
 void
 finish_options (struct gcc_options *opts, struct gcc_options *opts_set,
-		location_t loc, unsigned int lang_mask)
+		location_t loc)
 {
   enum unwind_info_type ui_except;
 
@@ -1230,10 +1228,6 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set,
 					 opts->x_flag_live_patching,
 					 loc);
     }
-
-  /* Print --help=* if used.  */
-  if (help_option_argument != NULL)
-    print_help (opts, lang_mask);
 }
 
 #define LEFT_COLUMN	27
@@ -2066,7 +2060,7 @@ check_alignment_argument (location_t loc, const char *flag, const char *name)
 
 /* Print help when OPT__help_ is set.  */
 
-static void
+void
 print_help (struct gcc_options *opts, unsigned int lang_mask)
 {
   const char *a = help_option_argument;
diff --git a/gcc/opts.h b/gcc/opts.h
index 6e99eaddbaf..a8afc2385a9 100644
--- a/gcc/opts.h
+++ b/gcc/opts.h
@@ -418,8 +418,8 @@ extern bool target_handle_option (struct gcc_options *opts,
 				  void (*target_option_override_hook) (void));
 extern void finish_options (struct gcc_options *opts,
 			    struct gcc_options *opts_set,
-			    location_t loc,
-			    unsigned int lang_mask);
+			    location_t loc);
+extern void print_help (struct gcc_options *opts, unsigned int lang_mask);
 extern void default_options_optimization (struct gcc_options *opts,
 					  struct gcc_options *opts_set,
 					  struct cl_decoded_option *decoded_options,
@@ -443,6 +443,8 @@ extern const struct sanitizer_opts_s
   bool can_recover;
 } sanitizer_opts[];
 
+extern const char *help_option_argument;
+
 extern void add_misspelling_candidates (auto_vec<char *> *candidates,
 					const struct cl_option *option,
 					const char *base_option);