diff options
author | Ian Lance Taylor <iant@golang.org> | 2022-06-29 15:32:04 -0700 |
---|---|---|
committer | Ian Lance Taylor <iant@golang.org> | 2022-06-30 12:35:08 -0700 |
commit | 762fd5e5547e464e25b4bee435db6df4eda0de90 (patch) | |
tree | d8c2430a2b961bb36db967483ee520382cbaae08 | |
parent | 4c233cabbe388a6b8957c1507e129090e9267ceb (diff) | |
download | gcc-762fd5e5547e464e25b4bee435db6df4eda0de90.zip gcc-762fd5e5547e464e25b4bee435db6df4eda0de90.tar.gz gcc-762fd5e5547e464e25b4bee435db6df4eda0de90.tar.bz2 |
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
-rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
-rwxr-xr-x | libgo/mksysinfo.sh | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 4fde25a..0d49e9e 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 5aa3091..ea1fa17 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 |