From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2116) id 113693858D1E; Wed, 30 Nov 2022 20:21:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 113693858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669839696; bh=nc2GnsJbJR0FiEl2dQtKz+YsiC+QVcgwxsBqMQYnNrE=; h=From:To:Subject:Date:From; b=ehF8OMLOhKrkG2LCOmpBADEavZ5VIbdSWLmrdbhklqch6AIcyZ5hT/MMalg9J/aK+ LzGTFD/hUzcnbzXAl02T9fUbcJq6paWS80fmRTFVSYMdjjLxXPIdtSfHcXPrlVvUXC U6RSPdK+24S8xGPtpjOpEppHPQZRIx4agNQ3C0NY= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Ian Lance Taylor To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-4416] runtime: force XSI strerror on hurd X-Act-Checkin: gcc X-Git-Author: Ian Lance Taylor X-Git-Refname: refs/heads/master X-Git-Oldrev: b2aa75ded65f8c0293d73371e1660e7aeebb1eb6 X-Git-Newrev: 91607eba8fe49c064192122ec60a3e03dd8f2515 Message-Id: <20221130202136.113693858D1E@sourceware.org> Date: Wed, 30 Nov 2022 20:21:36 +0000 (GMT) List-Id: https://gcc.gnu.org/g:91607eba8fe49c064192122ec60a3e03dd8f2515 commit r13-4416-g91607eba8fe49c064192122ec60a3e03dd8f2515 Author: Ian Lance Taylor Date: Wed Nov 30 09:36:52 2022 -0800 runtime: force XSI strerror on hurd Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/454275 Diff: --- gcc/go/gofrontend/MERGE | 2 +- libgo/runtime/go-strerror.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 984d8324004..a26f779557d 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 13d1d91df84..8ff5ffbdfec 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