From 5e4e11fc645e56abf0a217a04090d2b6a036bf42 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Tue, 17 May 2022 11:09:05 +0200 Subject: [PATCH] unix/linux: use gotip instead of patched Go 1.18 CL 399336 added support for generating linux/loong64 types and constants by using a patched version of Go 1.18. The necessary changes have since been submitted to gotip, so use Go build from the master branch to generate types and consts. The changes in the cgo -godefs generated comments are due to CL 396936, also see go.dev/issue/52063 Change-Id: I314156675e79ba77b9eb1fa1845b20ca974ec77a Reviewed-on: https://go-review.googlesource.com/c/sys/+/406794 Reviewed-by: Ian Lance Taylor Reviewed-by: Michael Knyszek TryBot-Result: Gopher Robot Auto-Submit: Tobias Klauser Run-TryBot: Tobias Klauser --- unix/linux/Dockerfile | 7 +++---- unix/zerrors_linux_386.go | 2 +- unix/zerrors_linux_amd64.go | 2 +- unix/zerrors_linux_arm.go | 2 +- unix/zerrors_linux_arm64.go | 2 +- unix/zerrors_linux_loong64.go | 2 +- unix/zerrors_linux_mips.go | 2 +- unix/zerrors_linux_mips64.go | 2 +- unix/zerrors_linux_mips64le.go | 2 +- unix/zerrors_linux_mipsle.go | 2 +- unix/zerrors_linux_ppc.go | 2 +- unix/zerrors_linux_ppc64.go | 2 +- unix/zerrors_linux_ppc64le.go | 2 +- unix/zerrors_linux_riscv64.go | 2 +- unix/zerrors_linux_s390x.go | 2 +- unix/zerrors_linux_sparc64.go | 2 +- unix/ztypes_linux_386.go | 2 +- unix/ztypes_linux_amd64.go | 2 +- unix/ztypes_linux_arm.go | 2 +- unix/ztypes_linux_arm64.go | 2 +- unix/ztypes_linux_loong64.go | 2 +- unix/ztypes_linux_mips.go | 2 +- unix/ztypes_linux_mips64.go | 2 +- unix/ztypes_linux_mips64le.go | 2 +- unix/ztypes_linux_mipsle.go | 2 +- unix/ztypes_linux_ppc.go | 2 +- unix/ztypes_linux_ppc64.go | 2 +- unix/ztypes_linux_ppc64le.go | 2 +- unix/ztypes_linux_riscv64.go | 2 +- unix/ztypes_linux_s390x.go | 2 +- unix/ztypes_linux_sparc64.go | 2 +- 31 files changed, 33 insertions(+), 34 deletions(-) diff --git a/unix/linux/Dockerfile b/unix/linux/Dockerfile index bcee8935..1bb3996e 100644 --- a/unix/linux/Dockerfile +++ b/unix/linux/Dockerfile @@ -58,10 +58,9 @@ RUN apt-get update && apt-get install -y \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -# Only for loong64, add patch and build golang -RUN git clone https://go.googlesource.com/go --branch go1.18 /git/go \ - && cd /git/loong64-patches && git checkout go-v1.18 && cd /git/go && git am /git/loong64-patches/*.patch \ - && rm -rf /git/loong64-patches && cd /git/go/src && ./make.bash +# Only for loong64, build Go from master until 1.19 is released +RUN git clone https://go.googlesource.com/go --branch master /git/go \ + && cd /git/go/src && ./make.bash ENV PATH /git/go/bin:$PATH diff --git a/unix/zerrors_linux_386.go b/unix/zerrors_linux_386.go index 234fd4a5..1b305fab 100644 --- a/unix/zerrors_linux_386.go +++ b/unix/zerrors_linux_386.go @@ -5,7 +5,7 @@ // +build 386,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. -// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m32 /build/unix/_const.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m32 _const.go package unix diff --git a/unix/zerrors_linux_amd64.go b/unix/zerrors_linux_amd64.go index 58619b75..6bcdef5d 100644 --- a/unix/zerrors_linux_amd64.go +++ b/unix/zerrors_linux_amd64.go @@ -5,7 +5,7 @@ // +build amd64,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. -// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m64 /build/unix/_const.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m64 _const.go package unix diff --git a/unix/zerrors_linux_arm.go b/unix/zerrors_linux_arm.go index 3a64ff59..e65df0f8 100644 --- a/unix/zerrors_linux_arm.go +++ b/unix/zerrors_linux_arm.go @@ -5,7 +5,7 @@ // +build arm,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. -// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/unix/_const.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go package unix diff --git a/unix/zerrors_linux_arm64.go b/unix/zerrors_linux_arm64.go index abe0b925..c7021115 100644 --- a/unix/zerrors_linux_arm64.go +++ b/unix/zerrors_linux_arm64.go @@ -5,7 +5,7 @@ // +build arm64,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. -// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char /build/unix/_const.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char _const.go package unix diff --git a/unix/zerrors_linux_loong64.go b/unix/zerrors_linux_loong64.go index ebc5f321..0d83a1cd 100644 --- a/unix/zerrors_linux_loong64.go +++ b/unix/zerrors_linux_loong64.go @@ -5,7 +5,7 @@ // +build loong64,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. -// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/unix/_const.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go package unix diff --git a/unix/zerrors_linux_mips.go b/unix/zerrors_linux_mips.go index 14d7a843..7f44a495 100644 --- a/unix/zerrors_linux_mips.go +++ b/unix/zerrors_linux_mips.go @@ -5,7 +5,7 @@ // +build mips,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. -// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/unix/_const.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go package unix diff --git a/unix/zerrors_linux_mips64.go b/unix/zerrors_linux_mips64.go index 99e7c4ac..2f92b4e4 100644 --- a/unix/zerrors_linux_mips64.go +++ b/unix/zerrors_linux_mips64.go @@ -5,7 +5,7 @@ // +build mips64,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. -// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/unix/_const.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go package unix diff --git a/unix/zerrors_linux_mips64le.go b/unix/zerrors_linux_mips64le.go index 496364c3..f5367a96 100644 --- a/unix/zerrors_linux_mips64le.go +++ b/unix/zerrors_linux_mips64le.go @@ -5,7 +5,7 @@ // +build mips64le,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. -// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/unix/_const.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go package unix diff --git a/unix/zerrors_linux_mipsle.go b/unix/zerrors_linux_mipsle.go index 3e408308..2e22337d 100644 --- a/unix/zerrors_linux_mipsle.go +++ b/unix/zerrors_linux_mipsle.go @@ -5,7 +5,7 @@ // +build mipsle,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. -// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/unix/_const.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go package unix diff --git a/unix/zerrors_linux_ppc.go b/unix/zerrors_linux_ppc.go index 1151a7df..858c4f30 100644 --- a/unix/zerrors_linux_ppc.go +++ b/unix/zerrors_linux_ppc.go @@ -5,7 +5,7 @@ // +build ppc,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. -// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/unix/_const.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go package unix diff --git a/unix/zerrors_linux_ppc64.go b/unix/zerrors_linux_ppc64.go index ed17f249..af2a7ba6 100644 --- a/unix/zerrors_linux_ppc64.go +++ b/unix/zerrors_linux_ppc64.go @@ -5,7 +5,7 @@ // +build ppc64,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. -// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/unix/_const.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go package unix diff --git a/unix/zerrors_linux_ppc64le.go b/unix/zerrors_linux_ppc64le.go index d84a37c1..eaa2eb8e 100644 --- a/unix/zerrors_linux_ppc64le.go +++ b/unix/zerrors_linux_ppc64le.go @@ -5,7 +5,7 @@ // +build ppc64le,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. -// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/unix/_const.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go package unix diff --git a/unix/zerrors_linux_riscv64.go b/unix/zerrors_linux_riscv64.go index 5cafba83..faaa9f06 100644 --- a/unix/zerrors_linux_riscv64.go +++ b/unix/zerrors_linux_riscv64.go @@ -5,7 +5,7 @@ // +build riscv64,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. -// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/unix/_const.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go package unix diff --git a/unix/zerrors_linux_s390x.go b/unix/zerrors_linux_s390x.go index 6d122da4..0d161f0b 100644 --- a/unix/zerrors_linux_s390x.go +++ b/unix/zerrors_linux_s390x.go @@ -5,7 +5,7 @@ // +build s390x,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. -// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char /build/unix/_const.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char _const.go package unix diff --git a/unix/zerrors_linux_sparc64.go b/unix/zerrors_linux_sparc64.go index 6bd19e51..4fd497a3 100644 --- a/unix/zerrors_linux_sparc64.go +++ b/unix/zerrors_linux_sparc64.go @@ -5,7 +5,7 @@ // +build sparc64,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. -// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/unix/_const.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go package unix diff --git a/unix/ztypes_linux_386.go b/unix/ztypes_linux_386.go index 53140925..4948362f 100644 --- a/unix/ztypes_linux_386.go +++ b/unix/ztypes_linux_386.go @@ -1,4 +1,4 @@ -// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m32 /build/unix/linux/types.go | go run mkpost.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m32 linux/types.go | go run mkpost.go // Code generated by the command above; see README.md. DO NOT EDIT. //go:build 386 && linux diff --git a/unix/ztypes_linux_amd64.go b/unix/ztypes_linux_amd64.go index b02ab83d..f64345e0 100644 --- a/unix/ztypes_linux_amd64.go +++ b/unix/ztypes_linux_amd64.go @@ -1,4 +1,4 @@ -// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m64 /build/unix/linux/types.go | go run mkpost.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m64 linux/types.go | go run mkpost.go // Code generated by the command above; see README.md. DO NOT EDIT. //go:build amd64 && linux diff --git a/unix/ztypes_linux_arm.go b/unix/ztypes_linux_arm.go index 9e6871d2..72469c79 100644 --- a/unix/ztypes_linux_arm.go +++ b/unix/ztypes_linux_arm.go @@ -1,4 +1,4 @@ -// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/unix/linux/types.go | go run mkpost.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm && linux diff --git a/unix/ztypes_linux_arm64.go b/unix/ztypes_linux_arm64.go index b732d125..68f07228 100644 --- a/unix/ztypes_linux_arm64.go +++ b/unix/ztypes_linux_arm64.go @@ -1,4 +1,4 @@ -// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char /build/unix/linux/types.go | go run mkpost.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char linux/types.go | go run mkpost.go // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm64 && linux diff --git a/unix/ztypes_linux_loong64.go b/unix/ztypes_linux_loong64.go index 61fbb24f..090ae46c 100644 --- a/unix/ztypes_linux_loong64.go +++ b/unix/ztypes_linux_loong64.go @@ -1,4 +1,4 @@ -// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/unix/linux/types.go | go run mkpost.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go // Code generated by the command above; see README.md. DO NOT EDIT. //go:build loong64 && linux diff --git a/unix/ztypes_linux_mips.go b/unix/ztypes_linux_mips.go index 5310f71e..03604cca 100644 --- a/unix/ztypes_linux_mips.go +++ b/unix/ztypes_linux_mips.go @@ -1,4 +1,4 @@ -// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/unix/linux/types.go | go run mkpost.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go // Code generated by the command above; see README.md. DO NOT EDIT. //go:build mips && linux diff --git a/unix/ztypes_linux_mips64.go b/unix/ztypes_linux_mips64.go index 219bbb12..fe57a7b2 100644 --- a/unix/ztypes_linux_mips64.go +++ b/unix/ztypes_linux_mips64.go @@ -1,4 +1,4 @@ -// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/unix/linux/types.go | go run mkpost.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go // Code generated by the command above; see README.md. DO NOT EDIT. //go:build mips64 && linux diff --git a/unix/ztypes_linux_mips64le.go b/unix/ztypes_linux_mips64le.go index be9432da..3f0db4da 100644 --- a/unix/ztypes_linux_mips64le.go +++ b/unix/ztypes_linux_mips64le.go @@ -1,4 +1,4 @@ -// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/unix/linux/types.go | go run mkpost.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go // Code generated by the command above; see README.md. DO NOT EDIT. //go:build mips64le && linux diff --git a/unix/ztypes_linux_mipsle.go b/unix/ztypes_linux_mipsle.go index d0155a42..70ecd3b2 100644 --- a/unix/ztypes_linux_mipsle.go +++ b/unix/ztypes_linux_mipsle.go @@ -1,4 +1,4 @@ -// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/unix/linux/types.go | go run mkpost.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go // Code generated by the command above; see README.md. DO NOT EDIT. //go:build mipsle && linux diff --git a/unix/ztypes_linux_ppc.go b/unix/ztypes_linux_ppc.go index 01c17bcc..4e700120 100644 --- a/unix/ztypes_linux_ppc.go +++ b/unix/ztypes_linux_ppc.go @@ -1,4 +1,4 @@ -// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/unix/linux/types.go | go run mkpost.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go // Code generated by the command above; see README.md. DO NOT EDIT. //go:build ppc && linux diff --git a/unix/ztypes_linux_ppc64.go b/unix/ztypes_linux_ppc64.go index 944a9c3c..34a57c69 100644 --- a/unix/ztypes_linux_ppc64.go +++ b/unix/ztypes_linux_ppc64.go @@ -1,4 +1,4 @@ -// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/unix/linux/types.go | go run mkpost.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go // Code generated by the command above; see README.md. DO NOT EDIT. //go:build ppc64 && linux diff --git a/unix/ztypes_linux_ppc64le.go b/unix/ztypes_linux_ppc64le.go index 5d2c90e1..6b84a472 100644 --- a/unix/ztypes_linux_ppc64le.go +++ b/unix/ztypes_linux_ppc64le.go @@ -1,4 +1,4 @@ -// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/unix/linux/types.go | go run mkpost.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go // Code generated by the command above; see README.md. DO NOT EDIT. //go:build ppc64le && linux diff --git a/unix/ztypes_linux_riscv64.go b/unix/ztypes_linux_riscv64.go index e173cb51..c4a305fe 100644 --- a/unix/ztypes_linux_riscv64.go +++ b/unix/ztypes_linux_riscv64.go @@ -1,4 +1,4 @@ -// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/unix/linux/types.go | go run mkpost.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go // Code generated by the command above; see README.md. DO NOT EDIT. //go:build riscv64 && linux diff --git a/unix/ztypes_linux_s390x.go b/unix/ztypes_linux_s390x.go index 6106715d..a1f1e4c9 100644 --- a/unix/ztypes_linux_s390x.go +++ b/unix/ztypes_linux_s390x.go @@ -1,4 +1,4 @@ -// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char /build/unix/linux/types.go | go run mkpost.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char linux/types.go | go run mkpost.go // Code generated by the command above; see README.md. DO NOT EDIT. //go:build s390x && linux diff --git a/unix/ztypes_linux_sparc64.go b/unix/ztypes_linux_sparc64.go index ca7b37b4..df95ebf3 100644 --- a/unix/ztypes_linux_sparc64.go +++ b/unix/ztypes_linux_sparc64.go @@ -1,4 +1,4 @@ -// cgo -godefs -- -Wall -Werror -static -I/tmp/include /build/unix/linux/types.go | go run mkpost.go +// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go // Code generated by the command above; see README.md. DO NOT EDIT. //go:build sparc64 && linux