aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2022-11-30 09:36:52 -0800
committerIan Lance Taylor <iant@golang.org>2022-11-30 12:21:15 -0800
commit91607eba8fe49c064192122ec60a3e03dd8f2515 (patch)
treefa64e757cd812cbc2327d75af8ecfb55e0867fa4
parentb2aa75ded65f8c0293d73371e1660e7aeebb1eb6 (diff)
downloadgcc-91607eba8fe49c064192122ec60a3e03dd8f2515.zip
gcc-91607eba8fe49c064192122ec60a3e03dd8f2515.tar.gz
gcc-91607eba8fe49c064192122ec60a3e03dd8f2515.tar.bz2
runtime: force XSI strerror on hurd
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/454275
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/runtime/go-strerror.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 984d832..a26f779 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-fef6aa3c1678cdbe7dca454b2cebb369d8ba81bf
+1c5bfd57131b68b91d8400bb017f35d416f7aa7b
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/libgo/runtime/go-strerror.c b/libgo/runtime/go-strerror.c
index 13d1d91..8ff5ffb 100644
--- a/libgo/runtime/go-strerror.c
+++ b/libgo/runtime/go-strerror.c
@@ -12,7 +12,7 @@
exists to selectively undefine it and provides an alias to the
XSI-compliant version of strerror_r(3). */
-#ifdef __linux__
+#if defined(__linux__) || defined(__gnu_hurd__)
/* Force selection of XSI-compliant strerror_r by glibc. */
#undef XOPEN_SOURCE
@@ -21,7 +21,7 @@
#define _POSIX_C_SOURCE 200112L
#undef _GNU_SOURCE
-#endif /* __linux__ */
+#endif /* defined(__linux__) || defined(__gnu_hurd__) */
#include <string.h>