mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-27 13:54:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

lto: support --jobserver-style=fifo for recent GNU make

Browse Source 
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 53e3b2bf16)
This commit is contained in:
Martin Liska 2022-08-09 13:59:36 +02:00
parent c6a1f7e00c
commit e4b5fec75a
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gcc/opts-common.cc
View File

@ -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)

2
gcc/opts-jobserver.h
View File

@ -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;
};