From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2116) id 9879B3858010; Thu, 30 Jun 2022 19:35:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9879B3858010 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Ian Lance Taylor To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-1371] libgo: handle stat st_atim32 field and SYS_SECCOMP X-Act-Checkin: gcc X-Git-Author: Ian Lance Taylor X-Git-Refname: refs/heads/master X-Git-Oldrev: 4c233cabbe388a6b8957c1507e129090e9267ceb X-Git-Newrev: 762fd5e5547e464e25b4bee435db6df4eda0de90 Message-Id: <20220630193517.9879B3858010@sourceware.org> Date: Thu, 30 Jun 2022 19:35:17 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jun 2022 19:35:17 -0000 https://gcc.gnu.org/g:762fd5e5547e464e25b4bee435db6df4eda0de90 commit r13-1371-g762fd5e5547e464e25b4bee435db6df4eda0de90 Author: Ian Lance Taylor Date: Wed Jun 29 15:32:04 2022 -0700 libgo: handle stat st_atim32 field and SYS_SECCOMP Patches for musl support, from Sören Tempel. Fixes PR go/105225 Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/415294 Diff: --- gcc/go/gofrontend/MERGE | 2 +- libgo/mksysinfo.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 4fde25af76e..0d49e9e70c6 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -63782f8a318e9eebfdc983f171a920c7a937c759 +548720bca6bff21ebc9aba22249d9ce45bbd90c7 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh index 5aa309155c3..ea1fa17d418 100755 --- a/libgo/mksysinfo.sh +++ b/libgo/mksysinfo.sh @@ -127,6 +127,7 @@ fi # The syscall numbers. We force the names to upper case. grep '^const _SYS_' gen-sysinfo.go | \ + grep -v '^const _SYS_SECCOMP = ' | \ sed -e 's/const _\(SYS_[^= ]*\).*$/\1/' | \ while read sys; do sup=`echo $sys | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ` @@ -506,7 +507,7 @@ fi # For historical reasons Go uses the suffix "timespec" instead of "tim" for # stat_t's time fields on NetBSD. -st_times='-e s/st_atim/Atim/ -e s/st_mtim/Mtim/ -e s/st_ctim/Ctim/' +st_times='-e s/st_atim/Atim/g -e s/st_mtim/Mtim/g -e s/st_ctim/Ctim/g' if test "${GOOS}" = "netbsd"; then st_times='-e s/st_atim/Atimespec/ -e s/st_mtim/Mtimespec/ -e s/st_ctim/Ctimespec/' fi