diff options
Diffstat (limited to 'gcc/lto-wrapper.cc')
| -rw-r--r-- | gcc/lto-wrapper.cc | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/gcc/lto-wrapper.cc b/gcc/lto-wrapper.cc index a980b20..dbe3ad0 100644 --- a/gcc/lto-wrapper.cc +++ b/gcc/lto-wrapper.cc @@ -55,7 +55,6 @@ along with GCC; see the file COPYING3. If not see #include "opts-diagnostic.h" #include "opt-suggestions.h" #include "opts-jobserver.h" -#include "make-unique.h" #include "lto-ltrans-cache.h" /* Environment variable, used for passing the names of offload targets from GCC @@ -321,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: @@ -740,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: @@ -802,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: @@ -2266,22 +2274,23 @@ 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 (diagnostic_option_id) const final override + int option_enabled_p (diagnostics::option_id) const final override { return true; } - char *make_option_name (diagnostic_option_id, - diagnostic_t, - diagnostic_t) const final override + char *make_option_name (diagnostics::option_id, + enum diagnostics::kind, + enum diagnostics::kind) const final override { return nullptr; } @@ -2308,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"); |