diff options
| author | Martin Liska <mliska@suse.cz> | 2022-08-09 13:59:36 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-12-22 11:59:13 +0100 |
| commit | 51e819e99f3e800d2fb1cb22b4648e6d0558e35b (patch) | |
| tree | 467374f3b8f04f7fd7d3d5a77c7665c6dc4af635 /gcc | |
| parent | f543f71c54be74256fb4ff7ab0142ffee55e999c (diff) | |
| download | gcc-51e819e99f3e800d2fb1cb22b4648e6d0558e35b.zip gcc-51e819e99f3e800d2fb1cb22b4648e6d0558e35b.tar.gz gcc-51e819e99f3e800d2fb1cb22b4648e6d0558e35b.tar.bz2 | |
lto: support --jobserver-style=fifo for recent GNU make
gcc/ChangeLog:
* opts-jobserver.h: Add one member.
* opts-common.c (jobserver_info::jobserver_info): Parse FIFO
format of --jobserver-auth.
(cherry picked from commit 53e3b2bf16a486c15c20991c6095f7be09012b55)
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/opts-common.c | 17 | ||||
| -rw-r--r-- | gcc/opts-jobserver.h | 2 |
2 files changed, 17 insertions, 2 deletions
diff --git a/gcc/opts-common.c b/gcc/opts-common.c index 04ae8d3..e5d0804 100644 --- a/gcc/opts-common.c +++ b/gcc/opts-common.c @@ -1810,8 +1810,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) @@ -1820,8 +1826,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 68ce188..98ea257 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; }; |