diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2021-01-03 21:40:04 +0100 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2021-01-03 21:40:04 +0100 |
| commit | afae4a55ccaa0de95ea11e5f634084db6ab2f444 (patch) | |
| tree | d632cc867d10410ba9fb750523be790b86846ac4 /gcc/lto-wrapper.c | |
| parent | 9d9a82ec8478ff52c7a9d61f58cd2a7b6295b5f9 (diff) | |
| parent | d2eb616a0f7bea78164912aa438c29fe1ef5774a (diff) | |
| download | gcc-afae4a55ccaa0de95ea11e5f634084db6ab2f444.zip gcc-afae4a55ccaa0de95ea11e5f634084db6ab2f444.tar.gz gcc-afae4a55ccaa0de95ea11e5f634084db6ab2f444.tar.bz2 | |
Merge branch 'master' into devel/coarray_native
Diffstat (limited to 'gcc/lto-wrapper.c')
| -rw-r--r-- | gcc/lto-wrapper.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gcc/lto-wrapper.c b/gcc/lto-wrapper.c index b2af3ca..da1305c 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 { @@ -1582,7 +1583,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; @@ -1775,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); |