From 19566bdda5762ddc769fc848dcad5e1e4abf8d0d Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Fri, 23 Aug 2019 13:27:12 +0200 Subject: [PATCH] Make -flto=jobserver parallel again. 2019-08-23 Martin Liska * lto-wrapper.c (run_gcc): When setting jobserver set also parallel to 1. This was done so before r273908. From-SVN: r274849 --- gcc/ChangeLog | 5 +++++ gcc/lto-wrapper.c | 12 +++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bd47b7736f1..df4d621f641 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2019-08-23 Martin Liska + + * lto-wrapper.c (run_gcc): When setting jobserver + set also parallel to 1. This was done so before r273908. + 2019-08-23 Dennis Zhang * config/arm/arm-cpus.in (cortex-m35p): New entry. diff --git a/gcc/lto-wrapper.c b/gcc/lto-wrapper.c index 68f63da910f..75ed289f3f2 100644 --- a/gcc/lto-wrapper.c +++ b/gcc/lto-wrapper.c @@ -1374,7 +1374,10 @@ run_gcc (unsigned argc, char *argv[]) case OPT_flto_: if (strcmp (option->arg, "jobserver") == 0) - jobserver = 1; + { + parallel = 1; + jobserver = 1; + } else if (strcmp (option->arg, "auto") == 0) { parallel = 1; @@ -1423,8 +1426,11 @@ run_gcc (unsigned argc, char *argv[]) auto_parallel = 0; parallel = 0; } - else if (!jobserver) - jobserver = jobserver_active_p (); + else if (!jobserver && jobserver_active_p ()) + { + parallel = 1; + jobserver = 1; + } if (linker_output) { -- 2.30.2