all: update go directive to 1.18

Done with: go get go@1.18 go mod tidy go fix ./... Using go1.21.3. Also update code generators to use only the new go:build lines, not the old +build ones. For golang/go#60268. Change-Id: I6aabc42efb6ab3329981100e1db2263aac5e92a6 Reviewed-on: https://go-review.googlesource.com/c/sys/+/534222 Reviewed-by: Ian Lance Taylor <iant@google.com> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
2026-01-29 07:02:06 +03:00 · 2023-10-11 10:25:48 -04:00
parent 1d9f0b6d88
commit 1bfbee0e20
418 changed files with 24 additions and 534 deletions
--- a/cpu/asm_aix_ppc64.s
+++ b/cpu/asm_aix_ppc64.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build gc
-// +build gc

 #include "textflag.h"

--- a/cpu/cpu_aix.go
+++ b/cpu/cpu_aix.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build aix
-// +build aix

 package cpu

--- a/cpu/cpu_arm64.s
+++ b/cpu/cpu_arm64.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build gc
-// +build gc

 #include "textflag.h"

--- a/cpu/cpu_gc_arm64.go
+++ b/cpu/cpu_gc_arm64.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build gc
-// +build gc

 package cpu

--- a/cpu/cpu_gc_s390x.go
+++ b/cpu/cpu_gc_s390x.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build gc
-// +build gc

 package cpu

--- a/cpu/cpu_gc_x86.go
+++ b/cpu/cpu_gc_x86.go
@@ -3,8 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build (386 || amd64 || amd64p32) && gc
-// +build 386 amd64 amd64p32
-// +build gc

 package cpu

--- a/cpu/cpu_gccgo_arm64.go
+++ b/cpu/cpu_gccgo_arm64.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build gccgo
-// +build gccgo

 package cpu

--- a/cpu/cpu_gccgo_s390x.go
+++ b/cpu/cpu_gccgo_s390x.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build gccgo
-// +build gccgo

 package cpu

--- a/cpu/cpu_gccgo_x86.c
+++ b/cpu/cpu_gccgo_x86.c
@@ -3,8 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build (386 || amd64 || amd64p32) && gccgo
-// +build 386 amd64 amd64p32
-// +build gccgo

 #include <cpuid.h>
 #include <stdint.h>
--- a/cpu/cpu_gccgo_x86.go
+++ b/cpu/cpu_gccgo_x86.go
@@ -3,8 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build (386 || amd64 || amd64p32) && gccgo
-// +build 386 amd64 amd64p32
-// +build gccgo

 package cpu

--- a/cpu/cpu_linux.go
+++ b/cpu/cpu_linux.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !386 && !amd64 && !amd64p32 && !arm64
-// +build !386,!amd64,!amd64p32,!arm64

 package cpu

--- a/cpu/cpu_linux_mips64x.go
+++ b/cpu/cpu_linux_mips64x.go
@@ -3,8 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux && (mips64 || mips64le)
-// +build linux
-// +build mips64 mips64le

 package cpu

--- a/cpu/cpu_linux_noinit.go
+++ b/cpu/cpu_linux_noinit.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux && !arm && !arm64 && !mips64 && !mips64le && !ppc64 && !ppc64le && !s390x
-// +build linux,!arm,!arm64,!mips64,!mips64le,!ppc64,!ppc64le,!s390x

 package cpu

--- a/cpu/cpu_linux_ppc64x.go
+++ b/cpu/cpu_linux_ppc64x.go
@@ -3,8 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux && (ppc64 || ppc64le)
-// +build linux
-// +build ppc64 ppc64le

 package cpu

--- a/cpu/cpu_loong64.go
+++ b/cpu/cpu_loong64.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build loong64
-// +build loong64

 package cpu

--- a/cpu/cpu_mips64x.go
+++ b/cpu/cpu_mips64x.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build mips64 || mips64le
-// +build mips64 mips64le

 package cpu

--- a/cpu/cpu_mipsx.go
+++ b/cpu/cpu_mipsx.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build mips || mipsle
-// +build mips mipsle

 package cpu

--- a/cpu/cpu_other_arm.go
+++ b/cpu/cpu_other_arm.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !linux && arm
-// +build !linux,arm

 package cpu

--- a/cpu/cpu_other_arm64.go
+++ b/cpu/cpu_other_arm64.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !linux && !netbsd && !openbsd && arm64
-// +build !linux,!netbsd,!openbsd,arm64

 package cpu

--- a/cpu/cpu_other_mips64x.go
+++ b/cpu/cpu_other_mips64x.go
@@ -3,8 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !linux && (mips64 || mips64le)
-// +build !linux
-// +build mips64 mips64le

 package cpu

--- a/cpu/cpu_other_ppc64x.go
+++ b/cpu/cpu_other_ppc64x.go
@@ -3,9 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !aix && !linux && (ppc64 || ppc64le)
-// +build !aix
-// +build !linux
-// +build ppc64 ppc64le

 package cpu

--- a/cpu/cpu_other_riscv64.go
+++ b/cpu/cpu_other_riscv64.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build !linux && riscv64
-// +build !linux,riscv64

 package cpu

--- a/cpu/cpu_ppc64x.go
+++ b/cpu/cpu_ppc64x.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build ppc64 || ppc64le
-// +build ppc64 ppc64le

 package cpu

--- a/cpu/cpu_riscv64.go
+++ b/cpu/cpu_riscv64.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build riscv64
-// +build riscv64

 package cpu

--- a/cpu/cpu_s390x.s
+++ b/cpu/cpu_s390x.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build gc
-// +build gc

 #include "textflag.h"

--- a/cpu/cpu_wasm.go
+++ b/cpu/cpu_wasm.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build wasm
-// +build wasm

 package cpu

--- a/cpu/cpu_x86.go
+++ b/cpu/cpu_x86.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build 386 || amd64 || amd64p32
-// +build 386 amd64 amd64p32

 package cpu

--- a/cpu/cpu_x86.s
+++ b/cpu/cpu_x86.s
@@ -3,8 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build (386 || amd64 || amd64p32) && gc
-// +build 386 amd64 amd64p32
-// +build gc

 #include "textflag.h"

--- a/cpu/endian_big.go
+++ b/cpu/endian_big.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build armbe || arm64be || m68k || mips || mips64 || mips64p32 || ppc || ppc64 || s390 || s390x || shbe || sparc || sparc64
-// +build armbe arm64be m68k mips mips64 mips64p32 ppc ppc64 s390 s390x shbe sparc sparc64

 package cpu

--- a/cpu/endian_little.go
+++ b/cpu/endian_little.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build 386 || amd64 || amd64p32 || alpha || arm || arm64 || loong64 || mipsle || mips64le || mips64p32le || nios2 || ppc64le || riscv || riscv64 || sh || wasm
-// +build 386 amd64 amd64p32 alpha arm arm64 loong64 mipsle mips64le mips64p32le nios2 ppc64le riscv riscv64 sh wasm

 package cpu

--- a/cpu/proc_cpuinfo_linux.go
+++ b/cpu/proc_cpuinfo_linux.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build linux && arm64
-// +build linux,arm64

 package cpu

--- a/cpu/runtime_auxv_go121.go
+++ b/cpu/runtime_auxv_go121.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build go1.21
-// +build go1.21

 package cpu

--- a/cpu/runtime_auxv_go121_test.go
+++ b/cpu/runtime_auxv_go121_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.

 //go:build go1.21
-// +build go1.21

 package cpu

--- a/cpu/syscall_aix_gccgo.go
+++ b/cpu/syscall_aix_gccgo.go
@@ -9,7 +9,6 @@
 // gccgo's libgo and thus must not used a CGo method.

 //go:build aix && gccgo
-// +build aix,gccgo

 package cpu

--- a/cpu/syscall_aix_ppc64_gc.go
+++ b/cpu/syscall_aix_ppc64_gc.go
@@ -7,7 +7,6 @@
 // (See golang.org/issue/32102)

 //go:build aix && ppc64 && gc
-// +build aix,ppc64,gc

 package cpu