From 119295372f3717e78edd43a8ae1a2003d0fcc0e6 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Mon, 26 Oct 2020 18:56:52 +0100 Subject: lto: no sub-make when --jobserver-auth= is missing We newly correctly detect that a job server is not active for a LTO linking: lto-wrapper: warning: jobserver is not available: '--jobserver-auth=' is not present in 'MAKEFLAGS' In that situation we should not call make -f abc.mk as it can leed to N^2 LTRANS units. gcc/ChangeLog: * lto-wrapper.c (run_gcc): Do not use sub-make when jobserver is not detected properly. --- gcc/lto-wrapper.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gcc/lto-wrapper.c') diff --git a/gcc/lto-wrapper.c b/gcc/lto-wrapper.c index b2af3ca..fe10f4f 100644 --- a/gcc/lto-wrapper.c +++ b/gcc/lto-wrapper.c @@ -1582,7 +1582,11 @@ run_gcc (unsigned argc, char *argv[]) { const char *jobserver_error = jobserver_active_p (); if (jobserver && jobserver_error != NULL) - warning (0, jobserver_error); + { + warning (0, jobserver_error); + parallel = 0; + jobserver = 0; + } else if (!jobserver && jobserver_error == NULL) { parallel = 1; -- cgit v1.1 From ca23341b28cd3af7985b83a6479107d9ea145a90 Mon Sep 17 00:00:00 2001 From: Martin Sebor Date: Wed, 25 Nov 2020 14:05:01 -0700 Subject: Clean up -Wformat-diag warnings (PR bootstrap/97622, PR bootstrap/94982) gcc/c-family/ChangeLog: PR bootstrap/94982 * c-attribs.c (handle_patchable_function_entry_attribute): Avoid -Wformat-diag. gcc/cp/ChangeLog: PR bootstrap/94982 * constraint.cc (debug_argument_list): Avoid -Wformat-diag. * error.c (function_category): Same. (print_template_differences): Same. * logic.cc (debug): Same. * name-lookup.c (lookup_using_decl): Same. * parser.c (maybe_add_cast_fixit): Same. (cp_parser_template_introduction): Same. * typeck.c (access_failure_info::add_fixit_hint): Same. gcc/ChangeLog: PR bootstrap/97622 PR bootstrap/94982 * config/i386/i386-options.c (ix86_valid_target_attribute_inner_p): Avoid -Wformat-diag. * digraph.cc (struct test_edge): Same. * dumpfile.c (dump_loc): Same. (dump_context::begin_scope): Same. * edit-context.c (edited_file::print_diff): Same. (edited_file::print_diff_hunk): Same. * json.cc (object::print): Same. * lto-wrapper.c (merge_and_complain): Same. * reload.c (find_reloads): Same. * tree-diagnostic-path.cc (print_path_summary_as_text): Same. * ubsan.c (ubsan_type_descriptor): Same. gcc/jit/ChangeLog: PR bootstrap/94982 * jit-recording.c (recording::function::dump_to_dot): Avoid -Wformat-diag. (recording::block::dump_to_dot): Same. gcc/testsuite/ChangeLog: PR bootstrap/94982 * c-c++-common/patchable_function_entry-error-3.c: Adjust text of expected warning. --- gcc/lto-wrapper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gcc/lto-wrapper.c') diff --git a/gcc/lto-wrapper.c b/gcc/lto-wrapper.c index fe10f4f..68ccb15 100644 --- a/gcc/lto-wrapper.c +++ b/gcc/lto-wrapper.c @@ -323,8 +323,9 @@ merge_and_complain (struct cl_decoded_option **decoded_options, if (cf_protection_option && cf_protection_option->value == CF_CHECK) fatal_error (input_location, - "option -fcf-protection with mismatching values" + "option %qs with mismatching values" " (%s, %s)", + "-fcf-protection", (*decoded_options)[j].arg, foption->arg); else { -- cgit v1.1 From cab1b0ebc00ea53040afcbe4b91e653a87915092 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Tue, 15 Dec 2020 09:59:04 +0100 Subject: lto: set nthreads_var to 1 if it is zero gcc/ChangeLog: PR lto/98275 * lto-wrapper.c: Do not use -j0 when we are unable to detect number of cores. --- gcc/lto-wrapper.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gcc/lto-wrapper.c') diff --git a/gcc/lto-wrapper.c b/gcc/lto-wrapper.c index 68ccb15..da1305c 100644 --- a/gcc/lto-wrapper.c +++ b/gcc/lto-wrapper.c @@ -1780,6 +1780,8 @@ cont1: { char buf[256]; init_num_threads (); + if (nthreads_var == 0) + nthreads_var = 1; if (verbose) fprintf (stderr, "LTO parallelism level set to %ld\n", nthreads_var); -- cgit v1.1