diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2025-09-02 15:58:26 -0700 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2025-09-02 15:58:26 -0700 |
| commit | 071b4126c613881f4cb25b4e5c39032964827f88 (patch) | |
| tree | 7ed805786566918630d1d617b1ed8f7310f5fd8e /gcc/lto-wrapper.cc | |
| parent | 845d23f3ea08ba873197c275a8857eee7edad996 (diff) | |
| parent | caa1c2f42691d68af4d894a5c3e700ecd2dba080 (diff) | |
| download | gcc-devel/gfortran-test.zip gcc-devel/gfortran-test.tar.gz gcc-devel/gfortran-test.tar.bz2 | |
Merge branch 'master' into gfortran-testdevel/gfortran-test
Diffstat (limited to 'gcc/lto-wrapper.cc')
| -rw-r--r-- | gcc/lto-wrapper.cc | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/gcc/lto-wrapper.cc b/gcc/lto-wrapper.cc index cb293f2..dbe3ad0 100644 --- a/gcc/lto-wrapper.cc +++ b/gcc/lto-wrapper.cc @@ -320,6 +320,9 @@ merge_and_complain (vec<cl_decoded_option> &decoded_options, case OPT_fdiagnostics_show_line_numbers: case OPT_fdiagnostics_show_option: case OPT_fdiagnostics_show_location_: + case OPT_fdiagnostics_show_nesting: + case OPT_fdiagnostics_show_nesting_locations: + case OPT_fdiagnostics_show_nesting_levels: case OPT_fshow_column: case OPT_fcommon: case OPT_fgnu_tm: @@ -739,6 +742,9 @@ append_compiler_options (obstack *argv_obstack, vec<cl_decoded_option> opts) case OPT_fdiagnostics_show_line_numbers: case OPT_fdiagnostics_show_option: case OPT_fdiagnostics_show_location_: + case OPT_fdiagnostics_show_nesting: + case OPT_fdiagnostics_show_nesting_locations: + case OPT_fdiagnostics_show_nesting_levels: case OPT_fshow_column: case OPT_fPIC: case OPT_fpic: @@ -801,6 +807,9 @@ append_diag_options (obstack *argv_obstack, vec<cl_decoded_option> opts) case OPT_fdiagnostics_show_line_numbers: case OPT_fdiagnostics_show_option: case OPT_fdiagnostics_show_location_: + case OPT_fdiagnostics_show_nesting: + case OPT_fdiagnostics_show_nesting_locations: + case OPT_fdiagnostics_show_nesting_levels: case OPT_fshow_column: break; default: @@ -2265,13 +2274,14 @@ cont: obstack_free (&argv_obstack, NULL); } -/* Concrete implementation of diagnostic_option_manager for LTO. */ +/* Concrete implementation of diagnostics::option_id_manager for LTO. */ -class lto_diagnostic_option_manager : public gcc_diagnostic_option_manager +class lto_diagnostic_option_id_manager + : public gcc_diagnostic_option_id_manager { public: - lto_diagnostic_option_manager () - : gcc_diagnostic_option_manager (0 /* lang_mask */) + lto_diagnostic_option_id_manager () + : gcc_diagnostic_option_id_manager (0 /* lang_mask */) { } int option_enabled_p (diagnostics::option_id) const final override @@ -2307,8 +2317,8 @@ main (int argc, char *argv[]) diagnostic_initialize (global_dc, 0); diagnostic_color_init (global_dc); diagnostic_urls_init (global_dc); - global_dc->set_option_manager - (::make_unique<lto_diagnostic_option_manager> (), 0); + global_dc->set_option_id_manager + (::make_unique<lto_diagnostic_option_id_manager> (), 0); if (atexit (lto_wrapper_cleanup) != 0) fatal_error (input_location, "%<atexit%> failed"); |