diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/gcc.c | 4 | ||||
| -rw-r--r-- | gcc/lto-wrapper.c | 4 | ||||
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/libiberty.h | 4 | ||||
| -rw-r--r-- | libiberty/ChangeLog | 5 | ||||
| -rw-r--r-- | libiberty/lrealpath.c | 16 |
7 files changed, 40 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fd18c4f..54f7d97 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2019-08-08 Martin Liska <mliska@suse.cz> + PR bootstrap/91352 + * gcc.c (driver::detect_jobserver): Use is_valid_fd. + * lto-wrapper.c (jobserver_active_p): Likewise. + +2019-08-08 Martin Liska <mliska@suse.cz> + * cgraphclones.c (set_new_clone_decl_and_node_flags): Drop IS_OPERATOR_NEW and IS_OPERATOR_DELETE. (create_version_clone_with_body): Likewise. @@ -8380,8 +8380,8 @@ driver::detect_jobserver () const = (sscanf (n + strlen (needle), "%d,%d", &rfd, &wfd) == 2 && rfd > 0 && wfd > 0 - && fcntl (rfd, F_GETFD) >= 0 - && fcntl (wfd, F_GETFD) >= 0); + && is_valid_fd (rfd) + && is_valid_fd (wfd)); /* Drop the jobserver if it's not working now. */ if (!jobserver) diff --git a/gcc/lto-wrapper.c b/gcc/lto-wrapper.c index f93ff50..f1253cd 100644 --- a/gcc/lto-wrapper.c +++ b/gcc/lto-wrapper.c @@ -1237,8 +1237,8 @@ jobserver_active_p (void) return (sscanf (n + strlen (needle), "%d,%d", &rfd, &wfd) == 2 && rfd > 0 && wfd > 0 - && fcntl (rfd, F_GETFD) >= 0 - && fcntl (wfd, F_GETFD) >= 0); + && is_valid_fd (rfd) + && is_valid_fd (wfd)); } /* Execute gcc. ARGC is the number of arguments. ARGV contains the arguments. */ diff --git a/include/ChangeLog b/include/ChangeLog index a4f3fe5..83bd789 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2019-08-08 Martin Liska <mliska@suse.cz> + + PR bootstrap/91352 + * libiberty.h (is_valid_fd): New function. + 2019-07-18 Eduard-Mihai Burtescu <eddyb@lyken.rs> * demangle.h (rust_is_mangled): Move to libiberty/rust-demangle.h. diff --git a/include/libiberty.h b/include/libiberty.h index 635519e..71192a2 100644 --- a/include/libiberty.h +++ b/include/libiberty.h @@ -137,6 +137,10 @@ extern const char *unix_lbasename (const char *) ATTRIBUTE_RETURNS_NONNULL ATTRI extern char *lrealpath (const char *); +/* Return true when FD file descriptor exists. */ + +extern int is_valid_fd (int fd); + /* Concatenate an arbitrary number of strings. You must pass NULL as the last argument of this function, to terminate the list of strings. Allocates memory using xmalloc. */ diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index c22d49f..95cb152 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2019-08-08 Martin Liska <mliska@suse.cz> + + PR bootstrap/91352 + * lrealpath.c (is_valid_fd): New function. + 2019-07-24 Martin Liska <mliska@suse.cz> PR lto/91228 diff --git a/libiberty/lrealpath.c b/libiberty/lrealpath.c index 7f66dc2..ac914a7 100644 --- a/libiberty/lrealpath.c +++ b/libiberty/lrealpath.c @@ -49,6 +49,9 @@ components will be simplified. The returned value will be allocated using #ifdef HAVE_STRING_H #include <string.h> #endif +#ifdef HAVE_FCNTL_H +#include <fcntl.h> +#endif /* On GNU libc systems the declaration is only visible with _GNU_SOURCE. */ #if defined(HAVE_CANONICALIZE_FILE_NAME) \ @@ -155,3 +158,16 @@ lrealpath (const char *filename) /* This system is a lost cause, just duplicate the filename. */ return strdup (filename); } + +/* Return true when FD file descriptor exists. */ + +int +is_valid_fd (int fd) +{ +#if defined(_WIN32) + HANDLE h = (HANDLE) _get_osfhandle (fd); + return h != (HANDLE) -1; +#else + return fcntl (fd, F_GETFD) >= 0; +#endif +} |