From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 7425A392B4D2; Fri, 9 Dec 2022 09:33:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7425A392B4D2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670578415; bh=wv4YIQsvwCUjd4kQgRxKeqGDTZGHaeGGUjlaUNYmZVc=; h=From:To:Subject:Date:From; b=voXRtZwIiV0OdBqF5ixYO0zE3v2yJ61pF9RX2DUR49fXuUREmHt3yz8+8vM4ysOot zwHHBJHVg1UXLyYtmR/iFjh+xjwfM3GhkQkuv7MDR8LnHvrR0bbh2V83ruY5mJvSwE tNt1ztDWE1PrfLb/FD2SMWD6RVBaOLE0bcR8dMbU= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/marxin/heads/backport-12)] lto: support --jobserver-style=fifo for recent GNU make X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/users/marxin/heads/backport-12 X-Git-Oldrev: 36628318326d8854234fb50f142eaef7a6be8ba8 X-Git-Newrev: 35c4567b37af5625526c47034fdb5efc65af3295 Message-Id: <20221209093335.7425A392B4D2@sourceware.org> Date: Fri, 9 Dec 2022 09:33:35 +0000 (GMT) List-Id: https://gcc.gnu.org/g:35c4567b37af5625526c47034fdb5efc65af3295 commit 35c4567b37af5625526c47034fdb5efc65af3295 Author: Martin Liska Date: Tue Aug 9 13:59:36 2022 +0200 lto: support --jobserver-style=fifo for recent GNU make gcc/ChangeLog: * opts-jobserver.h: Add one member. * opts-common.cc (jobserver_info::jobserver_info): Parse FIFO format of --jobserver-auth. (cherry picked from commit 53e3b2bf16a486c15c20991c6095f7be09012b55) Diff: --- gcc/opts-common.cc | 17 +++++++++++++++-- gcc/opts-jobserver.h | 2 ++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/gcc/opts-common.cc b/gcc/opts-common.cc index 8a4d32de3e5..7c07d504696 100644 --- a/gcc/opts-common.cc +++ b/gcc/opts-common.cc @@ -2008,8 +2008,14 @@ void prepend_xassembler_to_collect_as_options (const char *collect_as_options, jobserver_info::jobserver_info () { + /* Traditionally, GNU make uses opened pipes for jobserver-auth, + e.g. --jobserver-auth=3,4. + Starting with GNU make 4.4, one can use --jobserver-style=fifo + and then named pipe is used: --jobserver-auth=fifo:/tmp/hcsparta. */ + /* Detect jobserver and drop it if it's not working. */ string js_needle = "--jobserver-auth="; + string fifo_prefix = "fifo:"; const char *envval = getenv ("MAKEFLAGS"); if (envval != NULL) @@ -2018,8 +2024,15 @@ jobserver_info::jobserver_info () size_t n = makeflags.rfind (js_needle); if (n != string::npos) { - if (sscanf (makeflags.c_str () + n + js_needle.size (), - "%d,%d", &rfd, &wfd) == 2 + string ending = makeflags.substr (n + js_needle.size ()); + if (ending.find (fifo_prefix) == 0) + { + ending = ending.substr (fifo_prefix.size ()); + pipe_path = ending.substr (0, ending.find (' ')); + is_active = true; + } + else if (sscanf (makeflags.c_str () + n + js_needle.size (), + "%d,%d", &rfd, &wfd) == 2 && rfd > 0 && wfd > 0 && is_valid_fd (rfd) diff --git a/gcc/opts-jobserver.h b/gcc/opts-jobserver.h index 68ce188b84a..98ea2579962 100644 --- a/gcc/opts-jobserver.h +++ b/gcc/opts-jobserver.h @@ -37,6 +37,8 @@ struct jobserver_info int rfd = -1; /* File descriptor for writing used for jobserver communication. */ int wfd = -1; + /* Named pipe path. */ + string pipe_path = ""; /* Return true if jobserver is active. */ bool is_active = false; };