From f229e7031a6efb2f23241b5da000c3b3203081d6 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@golang.org>
Date: Wed, 25 Aug 2021 12:48:26 -0400
Subject: [PATCH] all: go fix -fix=buildtag std cmd (except for bootstrap deps,
vendor)
When these packages are released as part of Go 1.18,
Go 1.16 will no longer be supported, so we can remove
the +build tags in these files.
Ran go fix -fix=buildtag std cmd and then reverted the bootstrapDirs
as defined in src/cmd/dist/buildtool.go, which need to continue
to build with Go 1.4 for now.
Also reverted src/vendor and src/cmd/vendor, which will need
to be updated in their own repos first.
Manual changes in runtime/pprof/mprof_test.go to adjust line numbers.
For #41184.
Change-Id: Ic0f93f7091295b6abc76ed5cd6e6746e1280861e
Reviewed-on: https://go-review.googlesource.com/c/go/+/344955
Trust: Russ Cox <rsc@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
---
src/archive/tar/stat_actime1.go | 1 -
src/archive/tar/stat_actime2.go | 1 -
src/archive/tar/stat_unix.go | 1 -
src/bytes/boundary_test.go | 1 -
src/cmd/api/run.go | 1 -
src/cmd/go/go11.go | 1 -
src/cmd/go/go_unix_test.go | 1 -
src/cmd/go/internal/base/signal_notunix.go | 1 -
src/cmd/go/internal/base/signal_unix.go | 1 -
.../internal/filelock/filelock_fcntl.go | 1 -
.../internal/filelock/filelock_other.go | 1 -
.../internal/filelock/filelock_plan9.go | 1 -
.../internal/filelock/filelock_test.go | 1 -
.../internal/filelock/filelock_unix.go | 1 -
.../internal/filelock/filelock_windows.go | 1 -
.../lockedfile/lockedfile_filelock.go | 1 -
.../internal/lockedfile/lockedfile_plan9.go | 1 -
.../go/internal/lockedfile/lockedfile_test.go | 1 -
.../go/internal/lockedfile/transform_test.go | 1 -
src/cmd/go/internal/modfetch/bootstrap.go | 1 -
.../go/internal/modfetch/codehost/shell.go | 1 -
src/cmd/go/internal/modfetch/sumdb.go | 1 -
src/cmd/go/internal/modload/stat_openfile.go | 1 -
src/cmd/go/internal/modload/stat_unix.go | 1 -
src/cmd/go/internal/modload/stat_windows.go | 1 -
.../go/internal/robustio/robustio_flaky.go | 1 -
.../go/internal/robustio/robustio_other.go | 1 -
src/cmd/go/internal/test/genflags.go | 1 -
src/cmd/go/internal/web/bootstrap.go | 1 -
src/cmd/go/internal/web/http.go | 1 -
src/cmd/go/internal/web/url_other.go | 1 -
src/cmd/go/internal/web/url_other_test.go | 1 -
src/cmd/go/internal/work/testgo.go | 1 -
src/cmd/go/stop_other_test.go | 9 ---------
src/cmd/go/stop_unix_test.go | 1 -
src/cmd/nm/nm_cgo_test.go | 1 -
src/cmd/pprof/readlineui.go | 3 ---
src/cmd/trace/annotations_test.go | 1 -
src/cmd/trace/trace_test.go | 1 -
src/cmd/trace/trace_unix_test.go | 1 -
src/crypto/aes/aes_gcm.go | 1 -
src/crypto/aes/cipher_asm.go | 1 -
src/crypto/aes/cipher_generic.go | 1 -
src/crypto/aes/gcm_ppc64le.go | 1 -
src/crypto/cipher/xor_generic.go | 1 -
src/crypto/cipher/xor_ppc64x.go | 1 -
src/crypto/ecdsa/ecdsa_noasm.go | 1 -
src/crypto/ecdsa/ecdsa_s390x_test.go | 1 -
.../internal/edwards25519/field/fe_amd64.go | 1 -
.../edwards25519/field/fe_amd64_noasm.go | 1 -
.../internal/edwards25519/field/fe_arm64.go | 1 -
.../edwards25519/field/fe_arm64_noasm.go | 1 -
src/crypto/elliptic/export_generate.go | 1 -
src/crypto/elliptic/fuzz_test.go | 1 -
src/crypto/elliptic/gen_p256_table.go | 1 -
src/crypto/elliptic/p256.go | 1 -
src/crypto/elliptic/p256_asm.go | 1 -
src/crypto/elliptic/p256_asm_table.go | 1 -
src/crypto/elliptic/p256_asm_table_test.go | 1 -
src/crypto/elliptic/p256_generic.go | 1 -
src/crypto/elliptic/p256_ppc64le.go | 1 -
src/crypto/elliptic/p256_s390x.go | 1 -
src/crypto/internal/subtle/aliasing.go | 1 -
.../internal/subtle/aliasing_appengine.go | 1 -
src/crypto/md5/gen.go | 1 -
src/crypto/md5/md5block_decl.go | 1 -
src/crypto/md5/md5block_generic.go | 1 -
src/crypto/rand/eagain.go | 1 -
src/crypto/rand/rand_batched.go | 1 -
src/crypto/rand/rand_batched_test.go | 1 -
src/crypto/rand/rand_getentropy.go | 1 -
src/crypto/rand/rand_js.go | 1 -
src/crypto/rand/rand_unix.go | 1 -
src/crypto/sha1/fallback_test.go | 1 -
src/crypto/sha1/issue15617_test.go | 2 --
src/crypto/sha1/sha1block_decl.go | 1 -
src/crypto/sha1/sha1block_generic.go | 1 -
src/crypto/sha256/fallback_test.go | 1 -
src/crypto/sha256/sha256block_decl.go | 1 -
src/crypto/sha256/sha256block_generic.go | 1 -
src/crypto/sha512/fallback_test.go | 1 -
src/crypto/sha512/sha512block_amd64.go | 1 -
src/crypto/sha512/sha512block_decl.go | 1 -
src/crypto/sha512/sha512block_generic.go | 1 -
src/crypto/tls/generate_cert.go | 1 -
src/crypto/tls/handshake_unix_test.go | 1 -
.../x509/internal/macos/corefoundation.go | 1 -
src/crypto/x509/internal/macos/security.go | 1 -
src/crypto/x509/root_bsd.go | 1 -
src/crypto/x509/root_darwin.go | 1 -
src/crypto/x509/root_ios.go | 1 -
src/crypto/x509/root_ios_gen.go | 1 -
src/crypto/x509/root_js.go | 1 -
src/crypto/x509/root_omit.go | 2 --
src/crypto/x509/root_omit_test.go | 2 --
src/crypto/x509/root_plan9.go | 1 -
src/crypto/x509/root_unix.go | 1 -
src/crypto/x509/root_unix_test.go | 1 -
src/crypto/x509/x509_test_import.go | 1 -
src/encoding/csv/fuzz.go | 1 -
src/encoding/gob/debug.go | 1 -
src/encoding/gob/decgen.go | 1 -
src/encoding/gob/dump.go | 1 -
src/encoding/gob/encgen.go | 1 -
src/encoding/json/fuzz.go | 1 -
src/go/build/gc.go | 1 -
src/go/build/gccgo.go | 1 -
src/go/doc/headscan.go | 1 -
src/go/types/example_test.go | 1 -
src/go/types/gotype.go | 1 -
src/hash/crc32/crc32_otherarch.go | 1 -
src/hash/crc32/gen_const_ppc64le.go | 1 -
src/html/fuzz.go | 1 -
src/image/color/palette/gen.go | 1 -
src/image/internal/imageutil/gen.go | 1 -
src/image/png/fuzz.go | 1 -
src/index/suffixarray/gen.go | 1 -
src/internal/abi/abi_arm64.go | 1 -
src/internal/abi/abi_generic.go | 1 -
src/internal/abi/abi_ppc64x.go | 2 --
src/internal/bytealg/compare_generic.go | 1 -
src/internal/bytealg/compare_native.go | 1 -
src/internal/bytealg/count_generic.go | 1 -
src/internal/bytealg/count_native.go | 1 -
src/internal/bytealg/index_generic.go | 1 -
src/internal/bytealg/index_native.go | 1 -
src/internal/bytealg/index_ppc64x.go | 2 --
src/internal/bytealg/indexbyte_generic.go | 1 -
src/internal/bytealg/indexbyte_native.go | 1 -
src/internal/cpu/cpu_arm64_android.go | 1 -
src/internal/cpu/cpu_arm64_darwin.go | 1 -
src/internal/cpu/cpu_arm64_freebsd.go | 1 -
src/internal/cpu/cpu_arm64_hwcap.go | 1 -
src/internal/cpu/cpu_arm64_linux.go | 1 -
src/internal/cpu/cpu_arm64_other.go | 5 -----
src/internal/cpu/cpu_mips64x.go | 1 -
src/internal/cpu/cpu_no_name.go | 1 -
src/internal/cpu/cpu_ppc64x.go | 1 -
src/internal/cpu/cpu_ppc64x_aix.go | 1 -
src/internal/cpu/cpu_ppc64x_linux.go | 1 -
src/internal/cpu/cpu_x86.go | 1 -
src/internal/cpu/cpu_x86_test.go | 1 -
src/internal/fuzz/minimize_test.go | 1 -
src/internal/fuzz/sys_posix.go | 1 -
src/internal/fuzz/sys_unimplemented.go | 1 -
src/internal/fuzz/trace.go | 1 -
src/internal/goarch/gengoarch.go | 1 -
src/internal/goarch/zgoarch_386.go | 1 -
src/internal/goarch/zgoarch_amd64.go | 1 -
src/internal/goarch/zgoarch_arm.go | 1 -
src/internal/goarch/zgoarch_arm64.go | 1 -
src/internal/goarch/zgoarch_arm64be.go | 1 -
src/internal/goarch/zgoarch_armbe.go | 1 -
src/internal/goarch/zgoarch_loong64.go | 1 -
src/internal/goarch/zgoarch_mips.go | 1 -
src/internal/goarch/zgoarch_mips64.go | 1 -
src/internal/goarch/zgoarch_mips64le.go | 1 -
src/internal/goarch/zgoarch_mips64p32.go | 1 -
src/internal/goarch/zgoarch_mips64p32le.go | 1 -
src/internal/goarch/zgoarch_mipsle.go | 1 -
src/internal/goarch/zgoarch_ppc.go | 1 -
src/internal/goarch/zgoarch_ppc64.go | 1 -
src/internal/goarch/zgoarch_ppc64le.go | 1 -
src/internal/goarch/zgoarch_riscv.go | 1 -
src/internal/goarch/zgoarch_riscv64.go | 1 -
src/internal/goarch/zgoarch_s390.go | 1 -
src/internal/goarch/zgoarch_s390x.go | 1 -
src/internal/goarch/zgoarch_sparc.go | 1 -
src/internal/goarch/zgoarch_sparc64.go | 1 -
src/internal/goarch/zgoarch_wasm.go | 1 -
src/internal/goos/gengoos.go | 1 -
src/internal/goos/zgoos_aix.go | 1 -
src/internal/goos/zgoos_android.go | 1 -
src/internal/goos/zgoos_darwin.go | 1 -
src/internal/goos/zgoos_dragonfly.go | 1 -
src/internal/goos/zgoos_freebsd.go | 1 -
src/internal/goos/zgoos_hurd.go | 1 -
src/internal/goos/zgoos_illumos.go | 1 -
src/internal/goos/zgoos_ios.go | 1 -
src/internal/goos/zgoos_js.go | 1 -
src/internal/goos/zgoos_linux.go | 1 -
src/internal/goos/zgoos_netbsd.go | 1 -
src/internal/goos/zgoos_openbsd.go | 1 -
src/internal/goos/zgoos_plan9.go | 1 -
src/internal/goos/zgoos_solaris.go | 1 -
src/internal/goos/zgoos_windows.go | 1 -
src/internal/goos/zgoos_zos.go | 1 -
src/internal/goroot/gc.go | 1 -
src/internal/goroot/gccgo.go | 1 -
src/internal/poll/errno_unix.go | 1 -
src/internal/poll/errno_windows.go | 1 -
src/internal/poll/error_stub_test.go | 1 -
src/internal/poll/export_posix_test.go | 1 -
src/internal/poll/fcntl_js.go | 1 -
src/internal/poll/fcntl_libc.go | 1 -
src/internal/poll/fcntl_syscall.go | 1 -
src/internal/poll/fd_fsync_posix.go | 1 -
src/internal/poll/fd_poll_js.go | 1 -
src/internal/poll/fd_poll_runtime.go | 1 -
src/internal/poll/fd_posix.go | 1 -
src/internal/poll/fd_posix_test.go | 1 -
src/internal/poll/fd_unix.go | 1 -
src/internal/poll/fd_writev_darwin.go | 1 -
src/internal/poll/fd_writev_illumos.go | 1 -
src/internal/poll/fd_writev_unix.go | 1 -
src/internal/poll/hook_cloexec.go | 1 -
src/internal/poll/hook_unix.go | 1 -
src/internal/poll/iovec_illumos.go | 1 -
src/internal/poll/iovec_unix.go | 1 -
src/internal/poll/sendfile_bsd.go | 1 -
src/internal/poll/sock_cloexec.go | 1 -
src/internal/poll/sockopt.go | 1 -
src/internal/poll/sockopt_unix.go | 1 -
src/internal/poll/sockoptip.go | 1 -
src/internal/poll/strconv.go | 1 -
src/internal/poll/sys_cloexec.go | 1 -
src/internal/poll/writev.go | 1 -
.../syscall/execenv/execenv_default.go | 1 -
.../syscall/execenv/execenv_windows.go | 1 -
src/internal/syscall/unix/at.go | 1 -
src/internal/syscall/unix/at_libc.go | 1 -
.../syscall/unix/at_sysnum_fstatat64_linux.go | 1 -
.../syscall/unix/at_sysnum_fstatat_linux.go | 1 -
.../unix/at_sysnum_newfstatat_linux.go | 1 -
.../syscall/unix/fcntl_linux_32bit.go | 1 -
.../syscall/unix/getentropy_darwin.go | 1 -
src/internal/syscall/unix/getrandom.go | 1 -
src/internal/syscall/unix/nonblocking.go | 1 -
src/internal/syscall/unix/nonblocking_js.go | 1 -
src/internal/syscall/unix/nonblocking_libc.go | 1 -
src/internal/syscall/unix/pipe2_illumos.go | 1 -
.../syscall/unix/sysnum_linux_generic.go | 2 --
.../syscall/unix/sysnum_linux_mips64x.go | 1 -
.../syscall/unix/sysnum_linux_mipsx.go | 1 -
.../syscall/unix/sysnum_linux_ppc64x.go | 1 -
src/internal/syscall/unix/writev_illumos.go | 1 -
src/internal/testenv/testenv_cgo.go | 1 -
src/internal/testenv/testenv_notwin.go | 1 -
src/log/syslog/example_test.go | 1 -
src/log/syslog/syslog.go | 1 -
src/log/syslog/syslog_test.go | 1 -
src/log/syslog/syslog_unix.go | 1 -
src/math/cmplx/huge_test.go | 1 -
src/math/dim_asm.go | 1 -
src/math/dim_noasm.go | 1 -
src/math/exp2_asm.go | 1 -
src/math/exp2_noasm.go | 1 -
src/math/exp_amd64.go | 1 -
src/math/exp_asm.go | 1 -
src/math/exp_noasm.go | 1 -
src/math/floor_asm.go | 1 -
src/math/floor_noasm.go | 1 -
src/math/huge_test.go | 1 -
src/math/hypot_asm.go | 1 -
src/math/hypot_noasm.go | 1 -
src/math/log_asm.go | 1 -
src/math/log_stub.go | 1 -
src/math/modf_asm.go | 1 -
src/math/modf_noasm.go | 1 -
src/math/rand/gen_cooked.go | 1 -
src/math/sqrt_asm.go | 1 -
src/math/sqrt_noasm.go | 1 -
src/math/stubs.go | 1 -
src/mime/type_unix.go | 1 -
src/mime/type_unix_test.go | 1 -
src/net/addrselect.go | 1 -
src/net/addrselect_test.go | 1 -
src/net/cgo_aix.go | 1 -
src/net/cgo_android.go | 1 -
src/net/cgo_bsd.go | 3 ---
src/net/cgo_linux.go | 1 -
src/net/cgo_netbsd.go | 1 -
src/net/cgo_openbsd.go | 1 -
src/net/cgo_resnew.go | 3 ---
src/net/cgo_resold.go | 3 ---
src/net/cgo_socknew.go | 3 ---
src/net/cgo_sockold.go | 3 ---
src/net/cgo_solaris.go | 1 -
src/net/cgo_stub.go | 1 -
src/net/cgo_unix.go | 3 ---
src/net/cgo_unix_test.go | 3 ---
src/net/cgo_windows.go | 1 -
src/net/conf.go | 1 -
src/net/conf_netcgo.go | 1 -
src/net/conf_test.go | 1 -
src/net/conn_test.go | 1 -
src/net/dial_test.go | 1 -
src/net/dial_unix_test.go | 1 -
src/net/dnsclient_unix.go | 1 -
src/net/dnsclient_unix_test.go | 1 -
src/net/dnsconfig_unix.go | 1 -
src/net/dnsconfig_unix_test.go | 1 -
src/net/dnsname_test.go | 1 -
src/net/error_posix.go | 1 -
src/net/error_posix_test.go | 1 -
src/net/error_test.go | 1 -
src/net/error_unix.go | 1 -
src/net/error_unix_test.go | 1 -
src/net/external_test.go | 1 -
src/net/fcntl_libc_test.go | 1 -
src/net/fcntl_syscall_test.go | 1 -
src/net/fd_posix.go | 1 -
src/net/fd_unix.go | 1 -
src/net/file_stub.go | 1 -
src/net/file_test.go | 1 -
src/net/file_unix.go | 1 -
src/net/hook_unix.go | 1 -
src/net/http/cgi/plan9_test.go | 1 -
src/net/http/cgi/posix_test.go | 1 -
src/net/http/h2_bundle.go | 1 -
src/net/http/omithttp2.go | 1 -
src/net/http/roundtrip.go | 1 -
src/net/http/roundtrip_js.go | 1 -
src/net/http/triv.go | 1 -
src/net/interface_bsd.go | 1 -
src/net/interface_bsd_test.go | 1 -
src/net/interface_bsdvar.go | 1 -
src/net/interface_stub.go | 1 -
src/net/interface_test.go | 1 -
src/net/interface_unix_test.go | 1 -
src/net/internal/socktest/main_test.go | 1 -
src/net/internal/socktest/main_unix_test.go | 1 -
src/net/internal/socktest/switch_posix.go | 1 -
src/net/internal/socktest/switch_stub.go | 1 -
src/net/internal/socktest/switch_unix.go | 1 -
src/net/internal/socktest/sys_cloexec.go | 1 -
src/net/internal/socktest/sys_unix.go | 1 -
src/net/ip_test.go | 1 -
src/net/iprawsock_posix.go | 1 -
src/net/iprawsock_test.go | 1 -
src/net/ipsock_posix.go | 1 -
src/net/listen_test.go | 1 -
src/net/lookup_fake.go | 1 -
src/net/lookup_test.go | 1 -
src/net/lookup_unix.go | 1 -
src/net/main_cloexec_test.go | 1 -
src/net/main_conf_test.go | 1 -
src/net/main_noconf_test.go | 1 -
src/net/main_posix_test.go | 1 -
src/net/main_test.go | 1 -
src/net/main_unix_test.go | 1 -
src/net/mockserver_test.go | 1 -
src/net/net_fake.go | 1 -
src/net/net_test.go | 1 -
src/net/netgo_unix_test.go | 2 --
src/net/nss.go | 1 -
src/net/nss_test.go | 1 -
src/net/packetconn_test.go | 1 -
src/net/port_unix.go | 1 -
src/net/protoconn_test.go | 1 -
src/net/rawconn_stub_test.go | 1 -
src/net/rawconn_test.go | 1 -
src/net/rawconn_unix_test.go | 1 -
src/net/sendfile_stub.go | 1 -
src/net/sendfile_test.go | 1 -
src/net/sendfile_unix_alt.go | 1 -
src/net/server_test.go | 1 -
src/net/sock_bsd.go | 1 -
src/net/sock_cloexec.go | 1 -
src/net/sock_posix.go | 1 -
src/net/sock_stub.go | 1 -
src/net/sockaddr_posix.go | 1 -
src/net/sockopt_bsd.go | 1 -
src/net/sockopt_posix.go | 1 -
src/net/sockopt_stub.go | 1 -
src/net/sockoptip_bsdvar.go | 1 -
src/net/sockoptip_posix.go | 1 -
src/net/sockoptip_stub.go | 1 -
src/net/splice_stub.go | 1 -
src/net/splice_test.go | 1 -
src/net/sys_cloexec.go | 1 -
src/net/tcpsock_posix.go | 1 -
src/net/tcpsock_test.go | 1 -
src/net/tcpsock_unix_test.go | 1 -
src/net/tcpsockopt_posix.go | 1 -
src/net/tcpsockopt_stub.go | 1 -
src/net/tcpsockopt_unix.go | 1 -
src/net/timeout_test.go | 1 -
src/net/udpsock_posix.go | 1 -
src/net/udpsock_test.go | 1 -
src/net/unixsock_posix.go | 1 -
src/net/unixsock_readmsg_cloexec.go | 1 -
src/net/unixsock_readmsg_cmsg_cloexec.go | 1 -
src/net/unixsock_readmsg_other.go | 1 -
src/net/unixsock_readmsg_test.go | 1 -
src/net/unixsock_test.go | 1 -
src/net/unixsock_windows_test.go | 1 -
src/net/write_unix_test.go | 1 -
src/net/writev_test.go | 1 -
src/net/writev_unix.go | 1 -
src/os/dir_unix.go | 1 -
src/os/endian_big.go | 1 -
src/os/endian_little.go | 1 -
src/os/env_unix_test.go | 1 -
src/os/error_errno.go | 1 -
src/os/error_posix.go | 1 -
src/os/error_unix_test.go | 1 -
src/os/error_windows_test.go | 1 -
src/os/exec/exec_linux_test.go | 1 -
src/os/exec/exec_posix_test.go | 1 -
src/os/exec/exec_unix.go | 1 -
src/os/exec/exec_windows_test.go | 1 -
src/os/exec/lp_js.go | 1 -
src/os/exec/lp_unix.go | 1 -
src/os/exec/lp_unix_test.go | 1 -
src/os/exec/read3.go | 1 -
src/os/exec_posix.go | 1 -
src/os/exec_unix.go | 1 -
src/os/exec_unix_test.go | 1 -
src/os/executable_path.go | 1 -
src/os/executable_plan9.go | 1 -
src/os/executable_procfs.go | 1 -
src/os/executable_sysctl.go | 1 -
src/os/export_unix_test.go | 1 -
src/os/fifo_test.go | 1 -
src/os/file_posix.go | 1 -
src/os/file_unix.go | 1 -
src/os/os_unix_test.go | 1 -
src/os/path_unix.go | 1 -
src/os/pipe2_bsd.go | 1 -
src/os/pipe2_illumos.go | 1 -
src/os/pipe_bsd.go | 1 -
src/os/pipe_test.go | 1 -
src/os/rawconn.go | 1 -
src/os/rawconn_test.go | 1 -
src/os/readfrom_stub.go | 1 -
src/os/removeall_at.go | 1 -
src/os/removeall_noat.go | 1 -
src/os/signal/example_unix_test.go | 1 -
src/os/signal/internal/pty/pty.go | 2 --
src/os/signal/signal_cgo_test.go | 2 --
src/os/signal/signal_linux_test.go | 1 -
src/os/signal/signal_test.go | 1 -
src/os/signal/signal_unix.go | 1 -
src/os/stat_js.go | 1 -
src/os/stat_unix.go | 1 -
src/os/sticky_bsd.go | 1 -
src/os/sticky_notbsd.go | 8 --------
src/os/sys_bsd.go | 1 -
src/os/sys_js.go | 1 -
src/os/sys_unix.go | 1 -
src/os/timeout_test.go | 1 -
src/os/types_unix.go | 1 -
src/os/user/cgo_listgroups_unix.go | 3 ---
src/os/user/cgo_lookup_unix.go | 3 ---
src/os/user/cgo_unix_test.go | 3 ---
src/os/user/getgrouplist_darwin.go | 1 -
src/os/user/getgrouplist_unix.go | 3 ---
src/os/user/listgroups_stub.go | 1 -
src/os/user/lookup_android.go | 1 -
src/os/user/lookup_stubs.go | 1 -
src/os/user/lookup_unix.go | 2 --
src/os/user/lookup_unix_test.go | 2 --
src/os/wait_unimp.go | 1 -
src/os/wait_wait6.go | 1 -
src/os/wait_waitid.go | 1 -
src/path/filepath/example_unix_test.go | 1 -
src/path/filepath/example_unix_walk_test.go | 1 -
src/path/filepath/path_unix.go | 1 -
src/path/filepath/symlink_unix.go | 1 -
src/plugin/plugin_dlopen.go | 1 -
src/plugin/plugin_stubs.go | 1 -
src/plugin/plugin_test.go | 1 -
src/reflect/abi_test.go | 1 -
src/reflect/float32reg_generic.go | 1 -
src/reflect/stubs_ppc64x.go | 1 -
src/regexp/exec2_test.go | 1 -
src/runtime/abi_test.go | 1 -
src/runtime/asan.go | 1 -
src/runtime/asan0.go | 1 -
src/runtime/auxv_none.go | 1 -
src/runtime/cgo/callbacks_traceback.go | 1 -
src/runtime/cgo/dragonfly.go | 1 -
src/runtime/cgo/freebsd.go | 1 -
src/runtime/cgo/linux.go | 1 -
src/runtime/cgo/mmap.go | 1 -
src/runtime/cgo/netbsd.go | 1 -
src/runtime/cgo/openbsd.go | 1 -
src/runtime/cgo/setenv.go | 1 -
src/runtime/cgo/sigaction.go | 1 -
src/runtime/cgo_mmap.go | 1 -
src/runtime/cgo_ppc64x.go | 1 -
src/runtime/cgo_sigaction.go | 1 -
src/runtime/cputicks.go | 1 -
src/runtime/crash_cgo_test.go | 1 -
src/runtime/crash_nonunix_test.go | 1 -
src/runtime/crash_unix_test.go | 1 -
src/runtime/debug/panic_test.go | 1 -
src/runtime/debug_test.go | 1 -
src/runtime/debugcall.go | 1 -
src/runtime/debuglog_off.go | 1 -
src/runtime/debuglog_on.go | 1 -
src/runtime/defs1_linux.go | 1 -
src/runtime/defs2_linux.go | 1 -
src/runtime/defs3_linux.go | 1 -
src/runtime/defs_aix.go | 1 -
src/runtime/defs_aix_ppc64.go | 1 -
src/runtime/defs_arm_linux.go | 1 -
src/runtime/defs_darwin.go | 1 -
src/runtime/defs_dragonfly.go | 1 -
src/runtime/defs_freebsd.go | 1 -
src/runtime/defs_linux.go | 1 -
src/runtime/defs_linux_mips64x.go | 2 --
src/runtime/defs_linux_mipsx.go | 2 --
src/runtime/defs_netbsd.go | 1 -
src/runtime/defs_netbsd_386.go | 1 -
src/runtime/defs_netbsd_amd64.go | 1 -
src/runtime/defs_netbsd_arm.go | 1 -
src/runtime/defs_openbsd.go | 1 -
src/runtime/defs_solaris.go | 1 -
src/runtime/defs_solaris_amd64.go | 1 -
src/runtime/env_posix.go | 1 -
.../export_debug_regabiargs_off_test.go | 1 -
.../export_debug_regabiargs_on_test.go | 1 -
src/runtime/export_debug_test.go | 1 -
src/runtime/export_futex_test.go | 1 -
src/runtime/export_mmap_test.go | 1 -
src/runtime/export_pipe2_test.go | 1 -
src/runtime/export_pipe_test.go | 1 -
src/runtime/export_unix_test.go | 1 -
src/runtime/futex_test.go | 2 --
src/runtime/hash32.go | 1 -
src/runtime/hash64.go | 1 -
src/runtime/internal/atomic/atomic_386.go | 1 -
src/runtime/internal/atomic/atomic_arm.go | 1 -
src/runtime/internal/atomic/atomic_arm64.go | 1 -
src/runtime/internal/atomic/atomic_mips64x.go | 1 -
src/runtime/internal/atomic/atomic_mipsx.go | 1 -
src/runtime/internal/atomic/atomic_ppc64x.go | 1 -
src/runtime/internal/atomic/stubs.go | 1 -
src/runtime/internal/atomic/types_64bit.go | 1 -
src/runtime/internal/sys/intrinsics.go | 1 -
src/runtime/internal/sys/intrinsics_stubs.go | 1 -
src/runtime/lfstack_32bit.go | 1 -
src/runtime/lfstack_64bit.go | 1 -
src/runtime/libfuzzer.go | 1 -
src/runtime/lock_futex.go | 1 -
src/runtime/lock_js.go | 1 -
src/runtime/lock_sema.go | 1 -
src/runtime/lockrank_off.go | 1 -
src/runtime/lockrank_on.go | 1 -
src/runtime/mem_bsd.go | 1 -
src/runtime/mem_js.go | 1 -
src/runtime/mkduff.go | 1 -
src/runtime/mkfastlog2table.go | 1 -
src/runtime/mkpreempt.go | 1 -
src/runtime/mksizeclasses.go | 1 -
src/runtime/mmap.go | 9 ---------
src/runtime/mpagealloc_32bit.go | 1 -
src/runtime/mpagealloc_64bit.go | 1 -
src/runtime/msan.go | 1 -
src/runtime/msan0.go | 1 -
src/runtime/nbpipe_fcntl_libc_test.go | 1 -
src/runtime/nbpipe_fcntl_unix_test.go | 1 -
src/runtime/nbpipe_pipe.go | 1 -
src/runtime/nbpipe_pipe2.go | 1 -
src/runtime/nbpipe_test.go | 1 -
src/runtime/netpoll.go | 1 -
src/runtime/netpoll_epoll.go | 1 -
src/runtime/netpoll_fake.go | 1 -
src/runtime/netpoll_kqueue.go | 1 -
src/runtime/netpoll_stub.go | 1 -
src/runtime/norace_linux_test.go | 1 -
src/runtime/norace_test.go | 1 -
src/runtime/os_aix.go | 1 -
src/runtime/os_freebsd2.go | 1 -
src/runtime/os_freebsd_noauxv.go | 1 -
src/runtime/os_js.go | 1 -
src/runtime/os_linux_arm64.go | 1 -
src/runtime/os_linux_be64.go | 2 --
src/runtime/os_linux_generic.go | 1 -
src/runtime/os_linux_mips64x.go | 2 --
src/runtime/os_linux_mipsx.go | 2 --
src/runtime/os_linux_noauxv.go | 1 -
src/runtime/os_linux_novdso.go | 1 -
src/runtime/os_linux_ppc64x.go | 2 --
src/runtime/os_linux_x86.go | 2 --
src/runtime/os_nonopenbsd.go | 1 -
src/runtime/os_only_solaris.go | 1 -
src/runtime/os_openbsd_libc.go | 1 -
src/runtime/os_openbsd_syscall.go | 1 -
src/runtime/os_openbsd_syscall1.go | 1 -
src/runtime/os_openbsd_syscall2.go | 1 -
src/runtime/panic32.go | 1 -
src/runtime/pprof/mprof_test.go | 19 +++++++++----------
src/runtime/pprof/pprof_norusage.go | 1 -
src/runtime/pprof/pprof_rusage.go | 1 -
src/runtime/pprof/pprof_test.go | 1 -
src/runtime/pprof/rusage_test.go | 1 -
src/runtime/preempt_nonwindows.go | 1 -
src/runtime/race.go | 1 -
src/runtime/race/output_test.go | 1 -
src/runtime/race/race.go | 1 -
src/runtime/race/race_linux_test.go | 1 -
src/runtime/race/race_test.go | 1 -
src/runtime/race/race_unix_test.go | 2 --
src/runtime/race/race_windows_test.go | 1 -
src/runtime/race/sched_test.go | 1 -
src/runtime/race/syso_test.go | 1 -
src/runtime/race/timer_test.go | 1 -
src/runtime/race0.go | 1 -
src/runtime/relax_stub.go | 1 -
src/runtime/runtime_mmap_test.go | 1 -
src/runtime/runtime_unix_test.go | 1 -
src/runtime/semasleep_test.go | 1 -
src/runtime/sigaction.go | 1 -
src/runtime/signal_386.go | 1 -
src/runtime/signal_aix_ppc64.go | 1 -
src/runtime/signal_amd64.go | 2 --
src/runtime/signal_arm.go | 1 -
src/runtime/signal_arm64.go | 1 -
src/runtime/signal_linux_mips64x.go | 2 --
src/runtime/signal_linux_mipsx.go | 2 --
src/runtime/signal_linux_ppc64x.go | 2 --
src/runtime/signal_mips64x.go | 2 --
src/runtime/signal_mipsx.go | 2 --
src/runtime/signal_ppc64x.go | 2 --
src/runtime/signal_riscv64.go | 1 -
src/runtime/signal_unix.go | 1 -
src/runtime/signal_windows_test.go | 1 -
src/runtime/sigqueue.go | 1 -
src/runtime/sigqueue_note.go | 1 -
src/runtime/sigtab_linux_generic.go | 1 -
src/runtime/sigtab_linux_mipsx.go | 2 --
src/runtime/stubs2.go | 1 -
src/runtime/stubs3.go | 1 -
src/runtime/stubs_linux.go | 1 -
src/runtime/stubs_mips64x.go | 1 -
src/runtime/stubs_mipsx.go | 1 -
src/runtime/stubs_nonlinux.go | 1 -
src/runtime/stubs_ppc64.go | 1 -
src/runtime/stubs_ppc64x.go | 1 -
src/runtime/sys_libc.go | 1 -
src/runtime/sys_mips64x.go | 1 -
src/runtime/sys_mipsx.go | 1 -
src/runtime/sys_nonppc64x.go | 1 -
src/runtime/sys_openbsd.go | 1 -
src/runtime/sys_openbsd1.go | 1 -
src/runtime/sys_openbsd2.go | 1 -
src/runtime/sys_openbsd3.go | 1 -
src/runtime/sys_ppc64x.go | 1 -
src/runtime/sys_x86.go | 1 -
src/runtime/time_fake.go | 1 -
src/runtime/time_nofake.go | 1 -
src/runtime/timeasm.go | 2 --
src/runtime/timestub.go | 3 ---
src/runtime/timestub2.go | 7 -------
src/runtime/tls_stub.go | 1 -
src/runtime/vdso_elf32.go | 2 --
src/runtime/vdso_elf64.go | 2 --
src/runtime/vdso_freebsd.go | 1 -
src/runtime/vdso_freebsd_x86.go | 2 --
src/runtime/vdso_in_none.go | 1 -
src/runtime/vdso_linux.go | 2 --
src/runtime/vdso_linux_mips64x.go | 2 --
src/runtime/vdso_linux_ppc64x.go | 2 --
src/runtime/vlrt.go | 1 -
src/runtime/wincallback.go | 1 -
src/runtime/write_err.go | 1 -
src/sync/pool_test.go | 1 -
src/sync/runtime2.go | 1 -
src/sync/runtime2_lockrank.go | 1 -
src/syscall/bpf_bsd.go | 1 -
src/syscall/creds_test.go | 1 -
src/syscall/dirent.go | 1 -
src/syscall/dirent_test.go | 1 -
src/syscall/endian_big.go | 1 -
src/syscall/endian_little.go | 1 -
src/syscall/env_unix.go | 1 -
src/syscall/exec_aix_test.go | 1 -
src/syscall/exec_bsd.go | 1 -
src/syscall/exec_libc.go | 1 -
src/syscall/exec_libc2.go | 1 -
src/syscall/exec_linux.go | 1 -
src/syscall/exec_linux_test.go | 1 -
src/syscall/exec_pdeathsig_test.go | 1 -
src/syscall/exec_solaris_test.go | 1 -
src/syscall/exec_unix.go | 1 -
src/syscall/exec_unix_test.go | 1 -
src/syscall/export_unix_test.go | 1 -
src/syscall/flock.go | 1 -
src/syscall/flock_linux_32bit.go | 1 -
src/syscall/forkpipe.go | 1 -
src/syscall/forkpipe2.go | 1 -
src/syscall/fs_js.go | 1 -
src/syscall/getdirentries_test.go | 1 -
src/syscall/mkasm.go | 1 -
src/syscall/mkpost.go | 1 -
src/syscall/mksyscall_windows.go | 1 -
src/syscall/mmap_unix_test.go | 1 -
src/syscall/msan.go | 1 -
src/syscall/msan0.go | 1 -
src/syscall/net_js.go | 1 -
src/syscall/ptrace_darwin.go | 1 -
src/syscall/ptrace_ios.go | 1 -
src/syscall/route_bsd.go | 1 -
src/syscall/route_freebsd_32bit.go | 1 -
src/syscall/route_freebsd_64bit.go | 1 -
src/syscall/setuidgid_32_linux.go | 2 --
src/syscall/setuidgid_linux.go | 1 -
src/syscall/sockcmsg_unix.go | 1 -
src/syscall/sockcmsg_unix_other.go | 1 -
src/syscall/syscall_bsd.go | 1 -
src/syscall/syscall_bsd_test.go | 1 -
src/syscall/syscall_freebsd_test.go | 1 -
src/syscall/syscall_illumos.go | 1 -
src/syscall/syscall_js.go | 1 -
src/syscall/syscall_linux_mips64x.go | 2 --
src/syscall/syscall_linux_mipsx.go | 2 --
src/syscall/syscall_linux_ppc64x.go | 2 --
src/syscall/syscall_openbsd1.go | 1 -
src/syscall/syscall_openbsd_libc.go | 1 -
src/syscall/syscall_ptrace_test.go | 1 -
src/syscall/syscall_unix.go | 1 -
src/syscall/syscall_unix_test.go | 1 -
src/syscall/tables_js.go | 1 -
src/syscall/time_fake.go | 1 -
src/syscall/time_nofake.go | 1 -
src/syscall/timestruct.go | 1 -
src/syscall/types_aix.go | 1 -
src/syscall/types_darwin.go | 1 -
src/syscall/types_dragonfly.go | 1 -
src/syscall/types_freebsd.go | 1 -
src/syscall/types_illumos_amd64.go | 1 -
src/syscall/types_linux.go | 1 -
src/syscall/types_netbsd.go | 1 -
src/syscall/types_openbsd.go | 1 -
src/syscall/types_solaris.go | 1 -
src/syscall/zerrors_darwin_amd64.go | 1 -
src/syscall/zerrors_darwin_arm64.go | 1 -
src/syscall/zerrors_dragonfly_amd64.go | 1 -
src/syscall/zerrors_freebsd_386.go | 1 -
src/syscall/zerrors_freebsd_amd64.go | 1 -
src/syscall/zerrors_freebsd_arm.go | 1 -
src/syscall/zerrors_freebsd_arm64.go | 1 -
src/syscall/zerrors_linux_386.go | 1 -
src/syscall/zerrors_linux_amd64.go | 1 -
src/syscall/zerrors_linux_arm.go | 1 -
src/syscall/zerrors_linux_arm64.go | 1 -
src/syscall/zerrors_linux_ppc64.go | 1 -
src/syscall/zerrors_linux_ppc64le.go | 1 -
src/syscall/zerrors_netbsd_386.go | 1 -
src/syscall/zerrors_netbsd_amd64.go | 1 -
src/syscall/zerrors_netbsd_arm.go | 1 -
src/syscall/zerrors_netbsd_arm64.go | 1 -
src/syscall/zerrors_openbsd_386.go | 1 -
src/syscall/zerrors_openbsd_amd64.go | 1 -
src/syscall/zerrors_openbsd_arm.go | 1 -
src/syscall/zerrors_solaris_amd64.go | 1 -
src/syscall/zsyscall_aix_ppc64.go | 1 -
src/syscall/zsyscall_darwin_amd64.go | 1 -
src/syscall/zsyscall_darwin_arm64.go | 1 -
src/syscall/zsyscall_dragonfly_amd64.go | 1 -
src/syscall/zsyscall_freebsd_386.go | 1 -
src/syscall/zsyscall_freebsd_amd64.go | 1 -
src/syscall/zsyscall_freebsd_arm.go | 1 -
src/syscall/zsyscall_freebsd_arm64.go | 1 -
src/syscall/zsyscall_linux_386.go | 1 -
src/syscall/zsyscall_linux_amd64.go | 1 -
src/syscall/zsyscall_linux_arm.go | 1 -
src/syscall/zsyscall_linux_arm64.go | 1 -
src/syscall/zsyscall_linux_mips.go | 1 -
src/syscall/zsyscall_linux_mips64.go | 1 -
src/syscall/zsyscall_linux_mips64le.go | 1 -
src/syscall/zsyscall_linux_mipsle.go | 1 -
src/syscall/zsyscall_linux_ppc64.go | 1 -
src/syscall/zsyscall_linux_ppc64le.go | 1 -
src/syscall/zsyscall_linux_riscv64.go | 1 -
src/syscall/zsyscall_linux_s390x.go | 1 -
src/syscall/zsyscall_netbsd_386.go | 1 -
src/syscall/zsyscall_netbsd_amd64.go | 1 -
src/syscall/zsyscall_netbsd_arm.go | 1 -
src/syscall/zsyscall_netbsd_arm64.go | 1 -
src/syscall/zsyscall_openbsd_386.go | 1 -
src/syscall/zsyscall_openbsd_amd64.go | 1 -
src/syscall/zsyscall_openbsd_arm.go | 1 -
src/syscall/zsyscall_openbsd_arm64.go | 1 -
src/syscall/zsyscall_openbsd_mips64.go | 1 -
src/syscall/zsyscall_plan9_386.go | 1 -
src/syscall/zsyscall_plan9_amd64.go | 1 -
src/syscall/zsyscall_plan9_arm.go | 1 -
src/syscall/zsyscall_solaris_amd64.go | 1 -
src/syscall/zsysnum_darwin_amd64.go | 1 -
src/syscall/zsysnum_darwin_arm64.go | 1 -
src/syscall/zsysnum_dragonfly_amd64.go | 1 -
src/syscall/zsysnum_freebsd_386.go | 1 -
src/syscall/zsysnum_freebsd_amd64.go | 1 -
src/syscall/zsysnum_freebsd_arm.go | 1 -
src/syscall/zsysnum_freebsd_arm64.go | 1 -
src/syscall/zsysnum_linux_386.go | 1 -
src/syscall/zsysnum_linux_amd64.go | 1 -
src/syscall/zsysnum_linux_arm.go | 1 -
src/syscall/zsysnum_linux_arm64.go | 1 -
src/syscall/zsysnum_linux_ppc64.go | 1 -
src/syscall/zsysnum_linux_ppc64le.go | 1 -
src/syscall/zsysnum_netbsd_386.go | 1 -
src/syscall/zsysnum_netbsd_amd64.go | 1 -
src/syscall/zsysnum_netbsd_arm.go | 1 -
src/syscall/zsysnum_netbsd_arm64.go | 1 -
src/syscall/zsysnum_openbsd_386.go | 1 -
src/syscall/zsysnum_openbsd_amd64.go | 1 -
src/syscall/zsysnum_openbsd_arm.go | 1 -
src/syscall/zsysnum_solaris_amd64.go | 1 -
src/syscall/ztypes_darwin_amd64.go | 1 -
src/syscall/ztypes_darwin_arm64.go | 1 -
src/syscall/ztypes_dragonfly_amd64.go | 1 -
src/syscall/ztypes_freebsd_386.go | 1 -
src/syscall/ztypes_freebsd_amd64.go | 1 -
src/syscall/ztypes_freebsd_arm.go | 1 -
src/syscall/ztypes_freebsd_arm64.go | 1 -
src/syscall/ztypes_linux_386.go | 1 -
src/syscall/ztypes_linux_amd64.go | 1 -
src/syscall/ztypes_linux_arm.go | 1 -
src/syscall/ztypes_linux_arm64.go | 1 -
src/syscall/ztypes_linux_ppc64.go | 1 -
src/syscall/ztypes_linux_ppc64le.go | 1 -
src/syscall/ztypes_netbsd_386.go | 1 -
src/syscall/ztypes_netbsd_amd64.go | 1 -
src/syscall/ztypes_netbsd_arm.go | 1 -
src/syscall/ztypes_netbsd_arm64.go | 1 -
src/syscall/ztypes_openbsd_386.go | 1 -
src/syscall/ztypes_openbsd_amd64.go | 1 -
src/syscall/ztypes_solaris_amd64.go | 1 -
src/testing/run_example.go | 1 -
src/testing/run_example_js.go | 1 -
src/time/embed.go | 1 -
src/time/genzabbrs.go | 1 -
src/time/sys_plan9.go | 1 -
src/time/sys_unix.go | 1 -
src/time/tzdata/generate_zipdata.go | 1 -
src/time/zoneinfo_ios.go | 1 -
src/time/zoneinfo_js.go | 1 -
src/time/zoneinfo_unix.go | 1 -
src/time/zoneinfo_unix_test.go | 1 -
834 files changed, 9 insertions(+), 941 deletions(-)
diff --git a/src/archive/tar/stat_actime1.go b/src/archive/tar/stat_actime1.go
index 4fdf2a04b3d..c4c2480feeb 100644
--- a/src/archive/tar/stat_actime1.go
+++ b/src/archive/tar/stat_actime1.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || linux || dragonfly || openbsd || solaris
-// +build aix linux dragonfly openbsd solaris
package tar
diff --git a/src/archive/tar/stat_actime2.go b/src/archive/tar/stat_actime2.go
index 5a9a35cbb4e..f76d6be220f 100644
--- a/src/archive/tar/stat_actime2.go
+++ b/src/archive/tar/stat_actime2.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || freebsd || netbsd
-// +build darwin freebsd netbsd
package tar
diff --git a/src/archive/tar/stat_unix.go b/src/archive/tar/stat_unix.go
index 3957349d6ef..717a0b3abc7 100644
--- a/src/archive/tar/stat_unix.go
+++ b/src/archive/tar/stat_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || linux || darwin || dragonfly || freebsd || openbsd || netbsd || solaris
-// +build aix linux darwin dragonfly freebsd openbsd netbsd solaris
package tar
diff --git a/src/bytes/boundary_test.go b/src/bytes/boundary_test.go
index 5a47526593b..8dac7518661 100644
--- a/src/bytes/boundary_test.go
+++ b/src/bytes/boundary_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//
//go:build linux
-// +build linux
package bytes_test
diff --git a/src/cmd/api/run.go b/src/cmd/api/run.go
index 81979de191a..1b94a1b883f 100644
--- a/src/cmd/api/run.go
+++ b/src/cmd/api/run.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
// The run program is invoked via the dist tool.
// To invoke manually: go tool dist test -run api --no-rebuild
diff --git a/src/cmd/go/go11.go b/src/cmd/go/go11.go
index a1f2727825e..9faa7cba42e 100644
--- a/src/cmd/go/go11.go
+++ b/src/cmd/go/go11.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build go1.1
-// +build go1.1
package main
diff --git a/src/cmd/go/go_unix_test.go b/src/cmd/go/go_unix_test.go
index 7d5ff9bbb74..bab94944014 100644
--- a/src/cmd/go/go_unix_test.go
+++ b/src/cmd/go/go_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
package main_test
diff --git a/src/cmd/go/internal/base/signal_notunix.go b/src/cmd/go/internal/base/signal_notunix.go
index 5cc0b0f1011..682705f9b2c 100644
--- a/src/cmd/go/internal/base/signal_notunix.go
+++ b/src/cmd/go/internal/base/signal_notunix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build plan9 || windows
-// +build plan9 windows
package base
diff --git a/src/cmd/go/internal/base/signal_unix.go b/src/cmd/go/internal/base/signal_unix.go
index cdc2658372e..657ff385841 100644
--- a/src/cmd/go/internal/base/signal_unix.go
+++ b/src/cmd/go/internal/base/signal_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || js || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js linux netbsd openbsd solaris
package base
diff --git a/src/cmd/go/internal/lockedfile/internal/filelock/filelock_fcntl.go b/src/cmd/go/internal/lockedfile/internal/filelock/filelock_fcntl.go
index a37b2ad6d18..09354d23061 100644
--- a/src/cmd/go/internal/lockedfile/internal/filelock/filelock_fcntl.go
+++ b/src/cmd/go/internal/lockedfile/internal/filelock/filelock_fcntl.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || (solaris && !illumos)
-// +build aix solaris,!illumos
// This code implements the filelock API using POSIX 'fcntl' locks, which attach
// to an (inode, process) pair rather than a file descriptor. To avoid unlocking
diff --git a/src/cmd/go/internal/lockedfile/internal/filelock/filelock_other.go b/src/cmd/go/internal/lockedfile/internal/filelock/filelock_other.go
index 70f5d7a688a..491bec39af9 100644
--- a/src/cmd/go/internal/lockedfile/internal/filelock/filelock_other.go
+++ b/src/cmd/go/internal/lockedfile/internal/filelock/filelock_other.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !plan9 && !solaris && !windows
-// +build !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!plan9,!solaris,!windows
package filelock
diff --git a/src/cmd/go/internal/lockedfile/internal/filelock/filelock_plan9.go b/src/cmd/go/internal/lockedfile/internal/filelock/filelock_plan9.go
index 908afb6c8cb..54b2c946e0d 100644
--- a/src/cmd/go/internal/lockedfile/internal/filelock/filelock_plan9.go
+++ b/src/cmd/go/internal/lockedfile/internal/filelock/filelock_plan9.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build plan9
-// +build plan9
package filelock
diff --git a/src/cmd/go/internal/lockedfile/internal/filelock/filelock_test.go b/src/cmd/go/internal/lockedfile/internal/filelock/filelock_test.go
index 640d4406f42..7bd7bd28f55 100644
--- a/src/cmd/go/internal/lockedfile/internal/filelock/filelock_test.go
+++ b/src/cmd/go/internal/lockedfile/internal/filelock/filelock_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js && !plan9
-// +build !js,!plan9
package filelock_test
diff --git a/src/cmd/go/internal/lockedfile/internal/filelock/filelock_unix.go b/src/cmd/go/internal/lockedfile/internal/filelock/filelock_unix.go
index 878a1e770d4..d7778d05de1 100644
--- a/src/cmd/go/internal/lockedfile/internal/filelock/filelock_unix.go
+++ b/src/cmd/go/internal/lockedfile/internal/filelock/filelock_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || illumos || linux || netbsd || openbsd
-// +build darwin dragonfly freebsd illumos linux netbsd openbsd
package filelock
diff --git a/src/cmd/go/internal/lockedfile/internal/filelock/filelock_windows.go b/src/cmd/go/internal/lockedfile/internal/filelock/filelock_windows.go
index dd27ce92bd8..e2ca5383046 100644
--- a/src/cmd/go/internal/lockedfile/internal/filelock/filelock_windows.go
+++ b/src/cmd/go/internal/lockedfile/internal/filelock/filelock_windows.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build windows
-// +build windows
package filelock
diff --git a/src/cmd/go/internal/lockedfile/lockedfile_filelock.go b/src/cmd/go/internal/lockedfile/lockedfile_filelock.go
index e4923f68764..1a677a7fe4a 100644
--- a/src/cmd/go/internal/lockedfile/lockedfile_filelock.go
+++ b/src/cmd/go/internal/lockedfile/lockedfile_filelock.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !plan9
-// +build !plan9
package lockedfile
diff --git a/src/cmd/go/internal/lockedfile/lockedfile_plan9.go b/src/cmd/go/internal/lockedfile/lockedfile_plan9.go
index 979118b10ae..35669388e05 100644
--- a/src/cmd/go/internal/lockedfile/lockedfile_plan9.go
+++ b/src/cmd/go/internal/lockedfile/lockedfile_plan9.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build plan9
-// +build plan9
package lockedfile
diff --git a/src/cmd/go/internal/lockedfile/lockedfile_test.go b/src/cmd/go/internal/lockedfile/lockedfile_test.go
index 3acc6695a74..c9907db46ce 100644
--- a/src/cmd/go/internal/lockedfile/lockedfile_test.go
+++ b/src/cmd/go/internal/lockedfile/lockedfile_test.go
@@ -4,7 +4,6 @@
// js does not support inter-process file locking.
//go:build !js
-// +build !js
package lockedfile_test
diff --git a/src/cmd/go/internal/lockedfile/transform_test.go b/src/cmd/go/internal/lockedfile/transform_test.go
index b753346e7da..3c1caa334eb 100644
--- a/src/cmd/go/internal/lockedfile/transform_test.go
+++ b/src/cmd/go/internal/lockedfile/transform_test.go
@@ -4,7 +4,6 @@
// js does not support inter-process file locking.
//go:build !js
-// +build !js
package lockedfile_test
diff --git a/src/cmd/go/internal/modfetch/bootstrap.go b/src/cmd/go/internal/modfetch/bootstrap.go
index ed694581a7c..e23669fb00c 100644
--- a/src/cmd/go/internal/modfetch/bootstrap.go
+++ b/src/cmd/go/internal/modfetch/bootstrap.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build cmd_go_bootstrap
-// +build cmd_go_bootstrap
package modfetch
diff --git a/src/cmd/go/internal/modfetch/codehost/shell.go b/src/cmd/go/internal/modfetch/codehost/shell.go
index 0e9f3819667..eaa01950b95 100644
--- a/src/cmd/go/internal/modfetch/codehost/shell.go
+++ b/src/cmd/go/internal/modfetch/codehost/shell.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
// Interactive debugging shell for codehost.Repo implementations.
diff --git a/src/cmd/go/internal/modfetch/sumdb.go b/src/cmd/go/internal/modfetch/sumdb.go
index 79961b43248..492b03bd84a 100644
--- a/src/cmd/go/internal/modfetch/sumdb.go
+++ b/src/cmd/go/internal/modfetch/sumdb.go
@@ -5,7 +5,6 @@
// Go checksum database lookup
//go:build !cmd_go_bootstrap
-// +build !cmd_go_bootstrap
package modfetch
diff --git a/src/cmd/go/internal/modload/stat_openfile.go b/src/cmd/go/internal/modload/stat_openfile.go
index 368f8931984..ff7c124af58 100644
--- a/src/cmd/go/internal/modload/stat_openfile.go
+++ b/src/cmd/go/internal/modload/stat_openfile.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (js && wasm) || plan9
-// +build js,wasm plan9
// On plan9, per http://9p.io/magic/man2html/2/access: “Since file permissions
// are checked by the server and group information is not known to the client,
diff --git a/src/cmd/go/internal/modload/stat_unix.go b/src/cmd/go/internal/modload/stat_unix.go
index e079d739902..8a3653ba80b 100644
--- a/src/cmd/go/internal/modload/stat_unix.go
+++ b/src/cmd/go/internal/modload/stat_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package modload
diff --git a/src/cmd/go/internal/modload/stat_windows.go b/src/cmd/go/internal/modload/stat_windows.go
index 825e60b27af..f29a99165e5 100644
--- a/src/cmd/go/internal/modload/stat_windows.go
+++ b/src/cmd/go/internal/modload/stat_windows.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build windows
-// +build windows
package modload
diff --git a/src/cmd/go/internal/robustio/robustio_flaky.go b/src/cmd/go/internal/robustio/robustio_flaky.go
index d5c241857b4..c56e36ca624 100644
--- a/src/cmd/go/internal/robustio/robustio_flaky.go
+++ b/src/cmd/go/internal/robustio/robustio_flaky.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build windows || darwin
-// +build windows darwin
package robustio
diff --git a/src/cmd/go/internal/robustio/robustio_other.go b/src/cmd/go/internal/robustio/robustio_other.go
index 3a20cac6cf8..da9a46e4fac 100644
--- a/src/cmd/go/internal/robustio/robustio_other.go
+++ b/src/cmd/go/internal/robustio/robustio_other.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !windows && !darwin
-// +build !windows,!darwin
package robustio
diff --git a/src/cmd/go/internal/test/genflags.go b/src/cmd/go/internal/test/genflags.go
index cba366062fc..10f290090c7 100644
--- a/src/cmd/go/internal/test/genflags.go
+++ b/src/cmd/go/internal/test/genflags.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
package main
diff --git a/src/cmd/go/internal/web/bootstrap.go b/src/cmd/go/internal/web/bootstrap.go
index 08686cdfcf9..ab88e9e4781 100644
--- a/src/cmd/go/internal/web/bootstrap.go
+++ b/src/cmd/go/internal/web/bootstrap.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build cmd_go_bootstrap
-// +build cmd_go_bootstrap
// This code is compiled only into the bootstrap 'go' binary.
// These stubs avoid importing packages with large dependency
diff --git a/src/cmd/go/internal/web/http.go b/src/cmd/go/internal/web/http.go
index 81f841d2c6d..a92326db01e 100644
--- a/src/cmd/go/internal/web/http.go
+++ b/src/cmd/go/internal/web/http.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !cmd_go_bootstrap
-// +build !cmd_go_bootstrap
// This code is compiled into the real 'go' binary, but it is not
// compiled into the binary that is built during all.bash, so as
diff --git a/src/cmd/go/internal/web/url_other.go b/src/cmd/go/internal/web/url_other.go
index 453af402b43..84bbd72820f 100644
--- a/src/cmd/go/internal/web/url_other.go
+++ b/src/cmd/go/internal/web/url_other.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !windows
-// +build !windows
package web
diff --git a/src/cmd/go/internal/web/url_other_test.go b/src/cmd/go/internal/web/url_other_test.go
index 4d6ed2ec7f8..5c197de800d 100644
--- a/src/cmd/go/internal/web/url_other_test.go
+++ b/src/cmd/go/internal/web/url_other_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !windows
-// +build !windows
package web
diff --git a/src/cmd/go/internal/work/testgo.go b/src/cmd/go/internal/work/testgo.go
index 8b77871b23f..a09b65a23c3 100644
--- a/src/cmd/go/internal/work/testgo.go
+++ b/src/cmd/go/internal/work/testgo.go
@@ -5,7 +5,6 @@
// This file contains extra hooks for testing the go command.
//go:build testgo
-// +build testgo
package work
diff --git a/src/cmd/go/stop_other_test.go b/src/cmd/go/stop_other_test.go
index e1cc6cf8ba7..35c12858c1d 100644
--- a/src/cmd/go/stop_other_test.go
+++ b/src/cmd/go/stop_other_test.go
@@ -3,15 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !(aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris)
-// +build !aix
-// +build !darwin
-// +build !dragonfly
-// +build !freebsd
-// +build !js !wasm
-// +build !linux
-// +build !netbsd
-// +build !openbsd
-// +build !solaris
package main_test
diff --git a/src/cmd/go/stop_unix_test.go b/src/cmd/go/stop_unix_test.go
index ac35b240f0a..5939f0d40d9 100644
--- a/src/cmd/go/stop_unix_test.go
+++ b/src/cmd/go/stop_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris
package main_test
diff --git a/src/cmd/nm/nm_cgo_test.go b/src/cmd/nm/nm_cgo_test.go
index 1544be041a8..0c826738ec9 100644
--- a/src/cmd/nm/nm_cgo_test.go
+++ b/src/cmd/nm/nm_cgo_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build cgo
-// +build cgo
package main
diff --git a/src/cmd/pprof/readlineui.go b/src/cmd/pprof/readlineui.go
index f46e934e0f3..7ad712cd60b 100644
--- a/src/cmd/pprof/readlineui.go
+++ b/src/cmd/pprof/readlineui.go
@@ -6,9 +6,6 @@
// that provides the readline functionality if possible.
//go:build (darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || windows) && !appengine && !android
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris windows
-// +build !appengine
-// +build !android
package main
diff --git a/src/cmd/trace/annotations_test.go b/src/cmd/trace/annotations_test.go
index acd5693c7d5..9f1c8e3b3b0 100644
--- a/src/cmd/trace/annotations_test.go
+++ b/src/cmd/trace/annotations_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
package main
diff --git a/src/cmd/trace/trace_test.go b/src/cmd/trace/trace_test.go
index 2b1a68d7f3d..87fd3a3515c 100644
--- a/src/cmd/trace/trace_test.go
+++ b/src/cmd/trace/trace_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
package main
diff --git a/src/cmd/trace/trace_unix_test.go b/src/cmd/trace/trace_unix_test.go
index 8dc56a8c7be..f35061ec630 100644
--- a/src/cmd/trace/trace_unix_test.go
+++ b/src/cmd/trace/trace_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
package main
diff --git a/src/crypto/aes/aes_gcm.go b/src/crypto/aes/aes_gcm.go
index 1de0e457a26..98fb6d8e9bf 100644
--- a/src/crypto/aes/aes_gcm.go
+++ b/src/crypto/aes/aes_gcm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64 || arm64
-// +build amd64 arm64
package aes
diff --git a/src/crypto/aes/cipher_asm.go b/src/crypto/aes/cipher_asm.go
index 4251805ef9b..c948f1a579e 100644
--- a/src/crypto/aes/cipher_asm.go
+++ b/src/crypto/aes/cipher_asm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64 || arm64
-// +build amd64 arm64
package aes
diff --git a/src/crypto/aes/cipher_generic.go b/src/crypto/aes/cipher_generic.go
index 22ce3be7f3c..bff21ae54b5 100644
--- a/src/crypto/aes/cipher_generic.go
+++ b/src/crypto/aes/cipher_generic.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !amd64 && !s390x && !ppc64le && !arm64
-// +build !amd64,!s390x,!ppc64le,!arm64
package aes
diff --git a/src/crypto/aes/gcm_ppc64le.go b/src/crypto/aes/gcm_ppc64le.go
index 01b4e087573..cba6c8873fe 100644
--- a/src/crypto/aes/gcm_ppc64le.go
+++ b/src/crypto/aes/gcm_ppc64le.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ppc64le
-// +build ppc64le
package aes
diff --git a/src/crypto/cipher/xor_generic.go b/src/crypto/cipher/xor_generic.go
index 03208402d79..43517a8e203 100644
--- a/src/crypto/cipher/xor_generic.go
+++ b/src/crypto/cipher/xor_generic.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !amd64 && !ppc64 && !ppc64le && !arm64
-// +build !amd64,!ppc64,!ppc64le,!arm64
package cipher
diff --git a/src/crypto/cipher/xor_ppc64x.go b/src/crypto/cipher/xor_ppc64x.go
index f520208a379..f81eec531d8 100644
--- a/src/crypto/cipher/xor_ppc64x.go
+++ b/src/crypto/cipher/xor_ppc64x.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ppc64 || ppc64le
-// +build ppc64 ppc64le
package cipher
diff --git a/src/crypto/ecdsa/ecdsa_noasm.go b/src/crypto/ecdsa/ecdsa_noasm.go
index 68670a4f93f..7fbca10b56f 100644
--- a/src/crypto/ecdsa/ecdsa_noasm.go
+++ b/src/crypto/ecdsa/ecdsa_noasm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !s390x
-// +build !s390x
package ecdsa
diff --git a/src/crypto/ecdsa/ecdsa_s390x_test.go b/src/crypto/ecdsa/ecdsa_s390x_test.go
index f5633fb8a62..fd1dc7c0605 100644
--- a/src/crypto/ecdsa/ecdsa_s390x_test.go
+++ b/src/crypto/ecdsa/ecdsa_s390x_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build s390x
-// +build s390x
package ecdsa
diff --git a/src/crypto/ed25519/internal/edwards25519/field/fe_amd64.go b/src/crypto/ed25519/internal/edwards25519/field/fe_amd64.go
index 8fe583939f1..363020bd6b8 100644
--- a/src/crypto/ed25519/internal/edwards25519/field/fe_amd64.go
+++ b/src/crypto/ed25519/internal/edwards25519/field/fe_amd64.go
@@ -1,7 +1,6 @@
// Code generated by command: go run fe_amd64_asm.go -out ../fe_amd64.s -stubs ../fe_amd64.go -pkg field. DO NOT EDIT.
//go:build amd64 && gc && !purego
-// +build amd64,gc,!purego
package field
diff --git a/src/crypto/ed25519/internal/edwards25519/field/fe_amd64_noasm.go b/src/crypto/ed25519/internal/edwards25519/field/fe_amd64_noasm.go
index ddb6c9b8f7f..9da280d1d88 100644
--- a/src/crypto/ed25519/internal/edwards25519/field/fe_amd64_noasm.go
+++ b/src/crypto/ed25519/internal/edwards25519/field/fe_amd64_noasm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !amd64 || !gc || purego
-// +build !amd64 !gc purego
package field
diff --git a/src/crypto/ed25519/internal/edwards25519/field/fe_arm64.go b/src/crypto/ed25519/internal/edwards25519/field/fe_arm64.go
index af459ef5154..075fe9b9257 100644
--- a/src/crypto/ed25519/internal/edwards25519/field/fe_arm64.go
+++ b/src/crypto/ed25519/internal/edwards25519/field/fe_arm64.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build arm64 && gc && !purego
-// +build arm64,gc,!purego
package field
diff --git a/src/crypto/ed25519/internal/edwards25519/field/fe_arm64_noasm.go b/src/crypto/ed25519/internal/edwards25519/field/fe_arm64_noasm.go
index 234a5b2e5d1..fc029ac12da 100644
--- a/src/crypto/ed25519/internal/edwards25519/field/fe_arm64_noasm.go
+++ b/src/crypto/ed25519/internal/edwards25519/field/fe_arm64_noasm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !arm64 || !gc || purego
-// +build !arm64 !gc purego
package field
diff --git a/src/crypto/elliptic/export_generate.go b/src/crypto/elliptic/export_generate.go
index 5fe3025cf82..f15b302d8cd 100644
--- a/src/crypto/elliptic/export_generate.go
+++ b/src/crypto/elliptic/export_generate.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build tablegen
-// +build tablegen
package elliptic
diff --git a/src/crypto/elliptic/fuzz_test.go b/src/crypto/elliptic/fuzz_test.go
index 8ff3bf3cc24..2b5ddae1d9e 100644
--- a/src/crypto/elliptic/fuzz_test.go
+++ b/src/crypto/elliptic/fuzz_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64 || arm64 || ppc64le
-// +build amd64 arm64 ppc64le
package elliptic
diff --git a/src/crypto/elliptic/gen_p256_table.go b/src/crypto/elliptic/gen_p256_table.go
index cdcddcb7361..54aafa2c386 100644
--- a/src/crypto/elliptic/gen_p256_table.go
+++ b/src/crypto/elliptic/gen_p256_table.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
package main
diff --git a/src/crypto/elliptic/p256.go b/src/crypto/elliptic/p256.go
index b2b12c8f138..7747de7a50b 100644
--- a/src/crypto/elliptic/p256.go
+++ b/src/crypto/elliptic/p256.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !amd64 && !arm64
-// +build !amd64,!arm64
package elliptic
diff --git a/src/crypto/elliptic/p256_asm.go b/src/crypto/elliptic/p256_asm.go
index d46b8091253..ff0c1596aa0 100644
--- a/src/crypto/elliptic/p256_asm.go
+++ b/src/crypto/elliptic/p256_asm.go
@@ -11,7 +11,6 @@
// https://eprint.iacr.org/2013/816.pdf
//go:build amd64 || arm64
-// +build amd64 arm64
package elliptic
diff --git a/src/crypto/elliptic/p256_asm_table.go b/src/crypto/elliptic/p256_asm_table.go
index 7f81cb6b3fb..ad2c6c2c51f 100644
--- a/src/crypto/elliptic/p256_asm_table.go
+++ b/src/crypto/elliptic/p256_asm_table.go
@@ -5,7 +5,6 @@
// Generated by gen_p256_table.go. DO NOT EDIT.
//go:build amd64 || arm64
-// +build amd64 arm64
package elliptic
diff --git a/src/crypto/elliptic/p256_asm_table_test.go b/src/crypto/elliptic/p256_asm_table_test.go
index d704dae2992..6abd8cb11bc 100644
--- a/src/crypto/elliptic/p256_asm_table_test.go
+++ b/src/crypto/elliptic/p256_asm_table_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64 || arm64
-// +build amd64 arm64
package elliptic
diff --git a/src/crypto/elliptic/p256_generic.go b/src/crypto/elliptic/p256_generic.go
index 25762a8f768..7f8fab5398e 100644
--- a/src/crypto/elliptic/p256_generic.go
+++ b/src/crypto/elliptic/p256_generic.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !amd64 && !s390x && !arm64 && !ppc64le
-// +build !amd64,!s390x,!arm64,!ppc64le
package elliptic
diff --git a/src/crypto/elliptic/p256_ppc64le.go b/src/crypto/elliptic/p256_ppc64le.go
index 40d9ed9d40f..e9a6a067a22 100644
--- a/src/crypto/elliptic/p256_ppc64le.go
+++ b/src/crypto/elliptic/p256_ppc64le.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ppc64le
-// +build ppc64le
package elliptic
diff --git a/src/crypto/elliptic/p256_s390x.go b/src/crypto/elliptic/p256_s390x.go
index 91e613b6310..735e9f57f12 100644
--- a/src/crypto/elliptic/p256_s390x.go
+++ b/src/crypto/elliptic/p256_s390x.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build s390x
-// +build s390x
package elliptic
diff --git a/src/crypto/internal/subtle/aliasing.go b/src/crypto/internal/subtle/aliasing.go
index 86e0f3cfe70..16e2fcab124 100644
--- a/src/crypto/internal/subtle/aliasing.go
+++ b/src/crypto/internal/subtle/aliasing.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !appengine
-// +build !appengine
// Package subtle implements functions that are often useful in cryptographic
// code but require careful thought to use correctly.
diff --git a/src/crypto/internal/subtle/aliasing_appengine.go b/src/crypto/internal/subtle/aliasing_appengine.go
index 35b442f7a23..90ac4b61cc2 100644
--- a/src/crypto/internal/subtle/aliasing_appengine.go
+++ b/src/crypto/internal/subtle/aliasing_appengine.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build appengine
-// +build appengine
// Package subtle implements functions that are often useful in cryptographic
// code but require careful thought to use correctly.
diff --git a/src/crypto/md5/gen.go b/src/crypto/md5/gen.go
index 29729fad015..cd2700a5cfe 100644
--- a/src/crypto/md5/gen.go
+++ b/src/crypto/md5/gen.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
// This program generates md5block.go
// Invoke as
diff --git a/src/crypto/md5/md5block_decl.go b/src/crypto/md5/md5block_decl.go
index bc2d58c0694..6716a0c9db7 100644
--- a/src/crypto/md5/md5block_decl.go
+++ b/src/crypto/md5/md5block_decl.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64 || 386 || arm || ppc64le || ppc64 || s390x || arm64
-// +build amd64 386 arm ppc64le ppc64 s390x arm64
package md5
diff --git a/src/crypto/md5/md5block_generic.go b/src/crypto/md5/md5block_generic.go
index 23ed75304f9..c929c2b84ac 100644
--- a/src/crypto/md5/md5block_generic.go
+++ b/src/crypto/md5/md5block_generic.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !amd64 && !386 && !arm && !ppc64le && !ppc64 && !s390x && !arm64
-// +build !amd64,!386,!arm,!ppc64le,!ppc64,!s390x,!arm64
package md5
diff --git a/src/crypto/rand/eagain.go b/src/crypto/rand/eagain.go
index 85d4d9d47f9..f018e759312 100644
--- a/src/crypto/rand/eagain.go
+++ b/src/crypto/rand/eagain.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package rand
diff --git a/src/crypto/rand/rand_batched.go b/src/crypto/rand/rand_batched.go
index d7c5bf3562d..3e8e6203829 100644
--- a/src/crypto/rand/rand_batched.go
+++ b/src/crypto/rand/rand_batched.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux || freebsd || dragonfly || solaris
-// +build linux freebsd dragonfly solaris
package rand
diff --git a/src/crypto/rand/rand_batched_test.go b/src/crypto/rand/rand_batched_test.go
index 2d20922c825..28e45aa689e 100644
--- a/src/crypto/rand/rand_batched_test.go
+++ b/src/crypto/rand/rand_batched_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux || freebsd || dragonfly || solaris
-// +build linux freebsd dragonfly solaris
package rand
diff --git a/src/crypto/rand/rand_getentropy.go b/src/crypto/rand/rand_getentropy.go
index dd725372ad9..2bf2f520324 100644
--- a/src/crypto/rand/rand_getentropy.go
+++ b/src/crypto/rand/rand_getentropy.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (darwin && !ios) || openbsd
-// +build darwin,!ios openbsd
package rand
diff --git a/src/crypto/rand/rand_js.go b/src/crypto/rand/rand_js.go
index 7ddc2b6169c..91e69fae5d6 100644
--- a/src/crypto/rand/rand_js.go
+++ b/src/crypto/rand/rand_js.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js && wasm
-// +build js,wasm
package rand
diff --git a/src/crypto/rand/rand_unix.go b/src/crypto/rand/rand_unix.go
index 81277eb6a5d..40347874c53 100644
--- a/src/crypto/rand/rand_unix.go
+++ b/src/crypto/rand/rand_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || plan9 || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd plan9 solaris
// Unix cryptographically secure pseudorandom number
// generator.
diff --git a/src/crypto/sha1/fallback_test.go b/src/crypto/sha1/fallback_test.go
index 4bb8b3324f2..45d1f57d39c 100644
--- a/src/crypto/sha1/fallback_test.go
+++ b/src/crypto/sha1/fallback_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build s390x
-// +build s390x
package sha1
diff --git a/src/crypto/sha1/issue15617_test.go b/src/crypto/sha1/issue15617_test.go
index 436f78c7453..df4e28f64ee 100644
--- a/src/crypto/sha1/issue15617_test.go
+++ b/src/crypto/sha1/issue15617_test.go
@@ -1,6 +1,4 @@
//go:build amd64 && (linux || darwin)
-// +build amd64
-// +build linux darwin
// Copyright 2016 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
diff --git a/src/crypto/sha1/sha1block_decl.go b/src/crypto/sha1/sha1block_decl.go
index 93054efa7c1..518a4b6b678 100644
--- a/src/crypto/sha1/sha1block_decl.go
+++ b/src/crypto/sha1/sha1block_decl.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build arm || 386 || s390x
-// +build arm 386 s390x
package sha1
diff --git a/src/crypto/sha1/sha1block_generic.go b/src/crypto/sha1/sha1block_generic.go
index 105aa318322..ba35155d0b9 100644
--- a/src/crypto/sha1/sha1block_generic.go
+++ b/src/crypto/sha1/sha1block_generic.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !amd64 && !386 && !arm && !s390x && !arm64
-// +build !amd64,!386,!arm,!s390x,!arm64
package sha1
diff --git a/src/crypto/sha256/fallback_test.go b/src/crypto/sha256/fallback_test.go
index 7ce88cbb2a8..3f561aadd65 100644
--- a/src/crypto/sha256/fallback_test.go
+++ b/src/crypto/sha256/fallback_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build s390x
-// +build s390x
package sha256
diff --git a/src/crypto/sha256/sha256block_decl.go b/src/crypto/sha256/sha256block_decl.go
index a6bb396f133..c9c11944876 100644
--- a/src/crypto/sha256/sha256block_decl.go
+++ b/src/crypto/sha256/sha256block_decl.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build 386 || amd64 || s390x || ppc64le
-// +build 386 amd64 s390x ppc64le
package sha256
diff --git a/src/crypto/sha256/sha256block_generic.go b/src/crypto/sha256/sha256block_generic.go
index 0f2bf8b2315..a8878c2eeea 100644
--- a/src/crypto/sha256/sha256block_generic.go
+++ b/src/crypto/sha256/sha256block_generic.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !amd64 && !386 && !s390x && !ppc64le && !arm64
-// +build !amd64,!386,!s390x,!ppc64le,!arm64
package sha256
diff --git a/src/crypto/sha512/fallback_test.go b/src/crypto/sha512/fallback_test.go
index faf732670ad..db5b13c38c4 100644
--- a/src/crypto/sha512/fallback_test.go
+++ b/src/crypto/sha512/fallback_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build s390x
-// +build s390x
package sha512
diff --git a/src/crypto/sha512/sha512block_amd64.go b/src/crypto/sha512/sha512block_amd64.go
index e2386f29ab6..8da3e1473f6 100644
--- a/src/crypto/sha512/sha512block_amd64.go
+++ b/src/crypto/sha512/sha512block_amd64.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64
-// +build amd64
package sha512
diff --git a/src/crypto/sha512/sha512block_decl.go b/src/crypto/sha512/sha512block_decl.go
index 6c22f44801b..c6dcdf5db62 100644
--- a/src/crypto/sha512/sha512block_decl.go
+++ b/src/crypto/sha512/sha512block_decl.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build s390x || ppc64le
-// +build s390x ppc64le
package sha512
diff --git a/src/crypto/sha512/sha512block_generic.go b/src/crypto/sha512/sha512block_generic.go
index 865a7356f1e..62ea237867b 100644
--- a/src/crypto/sha512/sha512block_generic.go
+++ b/src/crypto/sha512/sha512block_generic.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !amd64 && !s390x && !ppc64le
-// +build !amd64,!s390x,!ppc64le
package sha512
diff --git a/src/crypto/tls/generate_cert.go b/src/crypto/tls/generate_cert.go
index 7ea90f8a7b5..58fdd025db7 100644
--- a/src/crypto/tls/generate_cert.go
+++ b/src/crypto/tls/generate_cert.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
// Generate a self-signed X.509 certificate for a TLS server. Outputs to
// 'cert.pem' and 'key.pem' and will overwrite existing files.
diff --git a/src/crypto/tls/handshake_unix_test.go b/src/crypto/tls/handshake_unix_test.go
index 19fc6986769..b61e7c24efb 100644
--- a/src/crypto/tls/handshake_unix_test.go
+++ b/src/crypto/tls/handshake_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package tls
diff --git a/src/crypto/x509/internal/macos/corefoundation.go b/src/crypto/x509/internal/macos/corefoundation.go
index fcfbc1e5615..a91131ac984 100644
--- a/src/crypto/x509/internal/macos/corefoundation.go
+++ b/src/crypto/x509/internal/macos/corefoundation.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin && !ios
-// +build darwin,!ios
// Package macOS provides cgo-less wrappers for Core Foundation and
// Security.framework, similarly to how package syscall provides access to
diff --git a/src/crypto/x509/internal/macos/security.go b/src/crypto/x509/internal/macos/security.go
index 0f6fa42b7bf..a560248e8b7 100644
--- a/src/crypto/x509/internal/macos/security.go
+++ b/src/crypto/x509/internal/macos/security.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin && !ios
-// +build darwin,!ios
package macOS
diff --git a/src/crypto/x509/root_bsd.go b/src/crypto/x509/root_bsd.go
index 6712ea32a68..8ac205faa95 100644
--- a/src/crypto/x509/root_bsd.go
+++ b/src/crypto/x509/root_bsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd || netbsd || openbsd
-// +build dragonfly freebsd netbsd openbsd
package x509
diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go
index 05593bb1055..164ad9dc77a 100644
--- a/src/crypto/x509/root_darwin.go
+++ b/src/crypto/x509/root_darwin.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !ios
-// +build !ios
package x509
diff --git a/src/crypto/x509/root_ios.go b/src/crypto/x509/root_ios.go
index 9bc62f8abb6..c5e3fc0b729 100644
--- a/src/crypto/x509/root_ios.go
+++ b/src/crypto/x509/root_ios.go
@@ -2,7 +2,6 @@
// Update the version in root.go and regenerate with "go generate".
//go:build ios && !x509omitbundledroots
-// +build ios,!x509omitbundledroots
package x509
diff --git a/src/crypto/x509/root_ios_gen.go b/src/crypto/x509/root_ios_gen.go
index 3c98de5bb62..15eb1592ca6 100644
--- a/src/crypto/x509/root_ios_gen.go
+++ b/src/crypto/x509/root_ios_gen.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
// Generates root_ios.go.
//
diff --git a/src/crypto/x509/root_js.go b/src/crypto/x509/root_js.go
index f2c2c0af380..95930385177 100644
--- a/src/crypto/x509/root_js.go
+++ b/src/crypto/x509/root_js.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js && wasm
-// +build js,wasm
package x509
diff --git a/src/crypto/x509/root_omit.go b/src/crypto/x509/root_omit.go
index 81f2f112d07..299d74835ef 100644
--- a/src/crypto/x509/root_omit.go
+++ b/src/crypto/x509/root_omit.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ((darwin && arm64) || (darwin && amd64 && ios)) && x509omitbundledroots
-// +build darwin,arm64 darwin,amd64,ios
-// +build x509omitbundledroots
// This file provides the loadSystemRoots func when the
// "x509omitbundledroots" build tag has disabled bundling a copy,
diff --git a/src/crypto/x509/root_omit_test.go b/src/crypto/x509/root_omit_test.go
index 158bd7f91ae..1709e2ea8b5 100644
--- a/src/crypto/x509/root_omit_test.go
+++ b/src/crypto/x509/root_omit_test.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ((darwin && arm64) || (darwin && amd64 && ios)) && x509omitbundledroots
-// +build darwin,arm64 darwin,amd64,ios
-// +build x509omitbundledroots
package x509
diff --git a/src/crypto/x509/root_plan9.go b/src/crypto/x509/root_plan9.go
index 2bdb2fe7136..3bd06fe50d8 100644
--- a/src/crypto/x509/root_plan9.go
+++ b/src/crypto/x509/root_plan9.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build plan9
-// +build plan9
package x509
diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
index dede825eddf..aa54f891ca0 100644
--- a/src/crypto/x509/root_unix.go
+++ b/src/crypto/x509/root_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris
-// +build aix dragonfly freebsd js,wasm linux netbsd openbsd solaris
package x509
diff --git a/src/crypto/x509/root_unix_test.go b/src/crypto/x509/root_unix_test.go
index 7118f12d744..7197a0de3b1 100644
--- a/src/crypto/x509/root_unix_test.go
+++ b/src/crypto/x509/root_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build dragonfly freebsd linux netbsd openbsd solaris
package x509
diff --git a/src/crypto/x509/x509_test_import.go b/src/crypto/x509/x509_test_import.go
index ef3ee807bf0..2474e3d810e 100644
--- a/src/crypto/x509/x509_test_import.go
+++ b/src/crypto/x509/x509_test_import.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
// This file is run by the x509 tests to ensure that a program with minimal
// imports can sign certificates without errors resulting from missing hash
diff --git a/src/encoding/csv/fuzz.go b/src/encoding/csv/fuzz.go
index a03fa83d8ce..5f5cdfcbf81 100644
--- a/src/encoding/csv/fuzz.go
+++ b/src/encoding/csv/fuzz.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build gofuzz
-// +build gofuzz
package csv
diff --git a/src/encoding/gob/debug.go b/src/encoding/gob/debug.go
index 5965fea921f..5ceb2bfac7b 100644
--- a/src/encoding/gob/debug.go
+++ b/src/encoding/gob/debug.go
@@ -4,7 +4,6 @@
// Delete the next line to include in the gob package.
//go:build ignore
-// +build ignore
package gob
diff --git a/src/encoding/gob/decgen.go b/src/encoding/gob/decgen.go
index 994be877d93..e40816eb869 100644
--- a/src/encoding/gob/decgen.go
+++ b/src/encoding/gob/decgen.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
// encgen writes the helper functions for encoding. Intended to be
// used with go generate; see the invocation in encode.go.
diff --git a/src/encoding/gob/dump.go b/src/encoding/gob/dump.go
index 8c0bbc4ff2e..f4b1bebfba1 100644
--- a/src/encoding/gob/dump.go
+++ b/src/encoding/gob/dump.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
package main
diff --git a/src/encoding/gob/encgen.go b/src/encoding/gob/encgen.go
index b562da177db..e5f68786a06 100644
--- a/src/encoding/gob/encgen.go
+++ b/src/encoding/gob/encgen.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
// encgen writes the helper functions for encoding. Intended to be
// used with go generate; see the invocation in encode.go.
diff --git a/src/encoding/json/fuzz.go b/src/encoding/json/fuzz.go
index d3fa2d11138..f00898a798d 100644
--- a/src/encoding/json/fuzz.go
+++ b/src/encoding/json/fuzz.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build gofuzz
-// +build gofuzz
package json
diff --git a/src/go/build/gc.go b/src/go/build/gc.go
index e16e186e0df..434991f66ef 100644
--- a/src/go/build/gc.go
+++ b/src/go/build/gc.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build gc
-// +build gc
package build
diff --git a/src/go/build/gccgo.go b/src/go/build/gccgo.go
index c8ec7041fb3..f806729f7e0 100644
--- a/src/go/build/gccgo.go
+++ b/src/go/build/gccgo.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build gccgo
-// +build gccgo
package build
diff --git a/src/go/doc/headscan.go b/src/go/doc/headscan.go
index df54b4bd61f..320895e43a4 100644
--- a/src/go/doc/headscan.go
+++ b/src/go/doc/headscan.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
The headscan command extracts comment headings from package files;
diff --git a/src/go/types/example_test.go b/src/go/types/example_test.go
index 32a25a41176..27025674864 100644
--- a/src/go/types/example_test.go
+++ b/src/go/types/example_test.go
@@ -6,7 +6,6 @@
// access to compiled packages for import.
//
//go:build !arm && !arm64
-// +build !arm,!arm64
package types_test
diff --git a/src/go/types/gotype.go b/src/go/types/gotype.go
index ca1d42c14d5..1126b73810c 100644
--- a/src/go/types/gotype.go
+++ b/src/go/types/gotype.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
// Build this command explicitly: go build gotype.go
diff --git a/src/hash/crc32/crc32_otherarch.go b/src/hash/crc32/crc32_otherarch.go
index 936e5bf3e0c..762515257da 100644
--- a/src/hash/crc32/crc32_otherarch.go
+++ b/src/hash/crc32/crc32_otherarch.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !amd64 && !s390x && !ppc64le && !arm64
-// +build !amd64,!s390x,!ppc64le,!arm64
package crc32
diff --git a/src/hash/crc32/gen_const_ppc64le.go b/src/hash/crc32/gen_const_ppc64le.go
index c98454c6850..2f15a60b50e 100644
--- a/src/hash/crc32/gen_const_ppc64le.go
+++ b/src/hash/crc32/gen_const_ppc64le.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
// Generate the constant table associated with the poly used by the
// vpmsumd crc32 algorithm.
diff --git a/src/html/fuzz.go b/src/html/fuzz.go
index ecaf4f90694..cd70f97106d 100644
--- a/src/html/fuzz.go
+++ b/src/html/fuzz.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build gofuzz
-// +build gofuzz
package html
diff --git a/src/image/color/palette/gen.go b/src/image/color/palette/gen.go
index 7bb257d865f..be46c57020c 100644
--- a/src/image/color/palette/gen.go
+++ b/src/image/color/palette/gen.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
package main
diff --git a/src/image/internal/imageutil/gen.go b/src/image/internal/imageutil/gen.go
index 38f41303fa7..65e1e30b64f 100644
--- a/src/image/internal/imageutil/gen.go
+++ b/src/image/internal/imageutil/gen.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
package main
diff --git a/src/image/png/fuzz.go b/src/image/png/fuzz.go
index 6508533f444..688b6c99361 100644
--- a/src/image/png/fuzz.go
+++ b/src/image/png/fuzz.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build gofuzz
-// +build gofuzz
package png
diff --git a/src/index/suffixarray/gen.go b/src/index/suffixarray/gen.go
index 3bc9b1e2aea..d6eb32e2aee 100644
--- a/src/index/suffixarray/gen.go
+++ b/src/index/suffixarray/gen.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
// Gen generates sais2.go by duplicating functions in sais.go
// using different input types.
diff --git a/src/internal/abi/abi_arm64.go b/src/internal/abi/abi_arm64.go
index 7544d7506ed..5c3dd6cbe28 100644
--- a/src/internal/abi/abi_arm64.go
+++ b/src/internal/abi/abi_arm64.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build goexperiment.regabireflect
-// +build goexperiment.regabireflect
package abi
diff --git a/src/internal/abi/abi_generic.go b/src/internal/abi/abi_generic.go
index e8f94f805f5..a36745f402c 100644
--- a/src/internal/abi/abi_generic.go
+++ b/src/internal/abi/abi_generic.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !goexperiment.regabireflect && !amd64
-// +build !goexperiment.regabireflect,!amd64
package abi
diff --git a/src/internal/abi/abi_ppc64x.go b/src/internal/abi/abi_ppc64x.go
index e38653224a4..d47271d1a18 100644
--- a/src/internal/abi/abi_ppc64x.go
+++ b/src/internal/abi/abi_ppc64x.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build goexperiment.regabireflect && (ppc64 || ppc64le)
-// +build goexperiment.regabireflect
-// +build ppc64 ppc64le
package abi
diff --git a/src/internal/bytealg/compare_generic.go b/src/internal/bytealg/compare_generic.go
index 0690d0cf31c..eaea168f2de 100644
--- a/src/internal/bytealg/compare_generic.go
+++ b/src/internal/bytealg/compare_generic.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !386 && !amd64 && !s390x && !arm && !arm64 && !ppc64 && !ppc64le && !mips && !mipsle && !wasm && !mips64 && !mips64le
-// +build !386,!amd64,!s390x,!arm,!arm64,!ppc64,!ppc64le,!mips,!mipsle,!wasm,!mips64,!mips64le
package bytealg
diff --git a/src/internal/bytealg/compare_native.go b/src/internal/bytealg/compare_native.go
index baa188ff7af..21ff8fe786d 100644
--- a/src/internal/bytealg/compare_native.go
+++ b/src/internal/bytealg/compare_native.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build 386 || amd64 || s390x || arm || arm64 || ppc64 || ppc64le || mips || mipsle || wasm || mips64 || mips64le
-// +build 386 amd64 s390x arm arm64 ppc64 ppc64le mips mipsle wasm mips64 mips64le
package bytealg
diff --git a/src/internal/bytealg/count_generic.go b/src/internal/bytealg/count_generic.go
index 1891d29b24c..932a7c584c1 100644
--- a/src/internal/bytealg/count_generic.go
+++ b/src/internal/bytealg/count_generic.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !amd64 && !arm && !arm64 && !ppc64le && !ppc64 && !riscv64 && !s390x
-// +build !amd64,!arm,!arm64,!ppc64le,!ppc64,!riscv64,!s390x
package bytealg
diff --git a/src/internal/bytealg/count_native.go b/src/internal/bytealg/count_native.go
index a19a6f8223f..90189c9fe05 100644
--- a/src/internal/bytealg/count_native.go
+++ b/src/internal/bytealg/count_native.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64 || arm || arm64 || ppc64le || ppc64 || riscv64 || s390x
-// +build amd64 arm arm64 ppc64le ppc64 riscv64 s390x
package bytealg
diff --git a/src/internal/bytealg/index_generic.go b/src/internal/bytealg/index_generic.go
index 0a6eb90d2d9..a59e32938e7 100644
--- a/src/internal/bytealg/index_generic.go
+++ b/src/internal/bytealg/index_generic.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !amd64 && !arm64 && !s390x && !ppc64le && !ppc64
-// +build !amd64,!arm64,!s390x,!ppc64le,!ppc64
package bytealg
diff --git a/src/internal/bytealg/index_native.go b/src/internal/bytealg/index_native.go
index 9547a5d8e2a..6e4a2f39e43 100644
--- a/src/internal/bytealg/index_native.go
+++ b/src/internal/bytealg/index_native.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64 || arm64 || s390x || ppc64le || ppc64
-// +build amd64 arm64 s390x ppc64le ppc64
package bytealg
diff --git a/src/internal/bytealg/index_ppc64x.go b/src/internal/bytealg/index_ppc64x.go
index c9b2b5a59f8..ab3cbe5e96e 100644
--- a/src/internal/bytealg/index_ppc64x.go
+++ b/src/internal/bytealg/index_ppc64x.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (aix || linux) && (ppc64 || ppc64le)
-// +build aix linux
-// +build ppc64 ppc64le
package bytealg
diff --git a/src/internal/bytealg/indexbyte_generic.go b/src/internal/bytealg/indexbyte_generic.go
index 6ef639fafdc..0a45f903843 100644
--- a/src/internal/bytealg/indexbyte_generic.go
+++ b/src/internal/bytealg/indexbyte_generic.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !386 && !amd64 && !s390x && !arm && !arm64 && !ppc64 && !ppc64le && !mips && !mipsle && !mips64 && !mips64le && !riscv64 && !wasm
-// +build !386,!amd64,!s390x,!arm,!arm64,!ppc64,!ppc64le,!mips,!mipsle,!mips64,!mips64le,!riscv64,!wasm
package bytealg
diff --git a/src/internal/bytealg/indexbyte_native.go b/src/internal/bytealg/indexbyte_native.go
index 965f38fe527..2101021e2d0 100644
--- a/src/internal/bytealg/indexbyte_native.go
+++ b/src/internal/bytealg/indexbyte_native.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build 386 || amd64 || s390x || arm || arm64 || ppc64 || ppc64le || mips || mipsle || mips64 || mips64le || riscv64 || wasm
-// +build 386 amd64 s390x arm arm64 ppc64 ppc64le mips mipsle mips64 mips64le riscv64 wasm
package bytealg
diff --git a/src/internal/cpu/cpu_arm64_android.go b/src/internal/cpu/cpu_arm64_android.go
index ac6eee54b21..fbdf7baca2f 100644
--- a/src/internal/cpu/cpu_arm64_android.go
+++ b/src/internal/cpu/cpu_arm64_android.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build arm64
-// +build arm64
package cpu
diff --git a/src/internal/cpu/cpu_arm64_darwin.go b/src/internal/cpu/cpu_arm64_darwin.go
index ce1b250a189..730e14caff0 100644
--- a/src/internal/cpu/cpu_arm64_darwin.go
+++ b/src/internal/cpu/cpu_arm64_darwin.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build arm64 && darwin && !ios
-// +build arm64,darwin,!ios
package cpu
diff --git a/src/internal/cpu/cpu_arm64_freebsd.go b/src/internal/cpu/cpu_arm64_freebsd.go
index 8c481370da6..c25e021c68f 100644
--- a/src/internal/cpu/cpu_arm64_freebsd.go
+++ b/src/internal/cpu/cpu_arm64_freebsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build arm64
-// +build arm64
package cpu
diff --git a/src/internal/cpu/cpu_arm64_hwcap.go b/src/internal/cpu/cpu_arm64_hwcap.go
index 8ac04fd8f97..0baa39f9cf7 100644
--- a/src/internal/cpu/cpu_arm64_hwcap.go
+++ b/src/internal/cpu/cpu_arm64_hwcap.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build arm64 && linux
-// +build arm64,linux
package cpu
diff --git a/src/internal/cpu/cpu_arm64_linux.go b/src/internal/cpu/cpu_arm64_linux.go
index c3a3f9a8e9d..d746bdb063e 100644
--- a/src/internal/cpu/cpu_arm64_linux.go
+++ b/src/internal/cpu/cpu_arm64_linux.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build arm64 && linux && !android
-// +build arm64,linux,!android
package cpu
diff --git a/src/internal/cpu/cpu_arm64_other.go b/src/internal/cpu/cpu_arm64_other.go
index e8b5d529a4b..d313648cb7c 100644
--- a/src/internal/cpu/cpu_arm64_other.go
+++ b/src/internal/cpu/cpu_arm64_other.go
@@ -3,11 +3,6 @@
// license that can be found in the LICENSE file.
//go:build arm64 && !linux && !freebsd && !android && (!darwin || ios)
-// +build arm64
-// +build !linux
-// +build !freebsd
-// +build !android
-// +build !darwin ios
package cpu
diff --git a/src/internal/cpu/cpu_mips64x.go b/src/internal/cpu/cpu_mips64x.go
index d2f9d4499ba..c452ffd8b30 100644
--- a/src/internal/cpu/cpu_mips64x.go
+++ b/src/internal/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
diff --git a/src/internal/cpu/cpu_no_name.go b/src/internal/cpu/cpu_no_name.go
index 8d563b536c3..37de951ba6d 100644
--- a/src/internal/cpu/cpu_no_name.go
+++ b/src/internal/cpu/cpu_no_name.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !386 && !amd64
-// +build !386,!amd64
package cpu
diff --git a/src/internal/cpu/cpu_ppc64x.go b/src/internal/cpu/cpu_ppc64x.go
index 2e7fd3ebb9f..83687d6ed34 100644
--- a/src/internal/cpu/cpu_ppc64x.go
+++ b/src/internal/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
diff --git a/src/internal/cpu/cpu_ppc64x_aix.go b/src/internal/cpu/cpu_ppc64x_aix.go
index 3d17a9c7304..d518edcf490 100644
--- a/src/internal/cpu/cpu_ppc64x_aix.go
+++ b/src/internal/cpu/cpu_ppc64x_aix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ppc64 || ppc64le
-// +build ppc64 ppc64le
package cpu
diff --git a/src/internal/cpu/cpu_ppc64x_linux.go b/src/internal/cpu/cpu_ppc64x_linux.go
index b7c73451118..7999656f01f 100644
--- a/src/internal/cpu/cpu_ppc64x_linux.go
+++ b/src/internal/cpu/cpu_ppc64x_linux.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ppc64 || ppc64le
-// +build ppc64 ppc64le
package cpu
diff --git a/src/internal/cpu/cpu_x86.go b/src/internal/cpu/cpu_x86.go
index 1582e832a45..81d5ceed61a 100644
--- a/src/internal/cpu/cpu_x86.go
+++ b/src/internal/cpu/cpu_x86.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build 386 || amd64
-// +build 386 amd64
package cpu
diff --git a/src/internal/cpu/cpu_x86_test.go b/src/internal/cpu/cpu_x86_test.go
index de1c5fb3b06..0fef065f206 100644
--- a/src/internal/cpu/cpu_x86_test.go
+++ b/src/internal/cpu/cpu_x86_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build 386 || amd64
-// +build 386 amd64
package cpu_test
diff --git a/src/internal/fuzz/minimize_test.go b/src/internal/fuzz/minimize_test.go
index dd76baff51f..13385e14d6e 100644
--- a/src/internal/fuzz/minimize_test.go
+++ b/src/internal/fuzz/minimize_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || linux || windows
-// +build darwin linux windows
package fuzz
diff --git a/src/internal/fuzz/sys_posix.go b/src/internal/fuzz/sys_posix.go
index ca6b1456e23..89c86c1ebbf 100644
--- a/src/internal/fuzz/sys_posix.go
+++ b/src/internal/fuzz/sys_posix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || linux
-// +build darwin linux
package fuzz
diff --git a/src/internal/fuzz/sys_unimplemented.go b/src/internal/fuzz/sys_unimplemented.go
index 827e36cf329..05954bb07fb 100644
--- a/src/internal/fuzz/sys_unimplemented.go
+++ b/src/internal/fuzz/sys_unimplemented.go
@@ -4,7 +4,6 @@
// TODO(jayconrod): support more platforms.
//go:build !darwin && !linux && !windows
-// +build !darwin,!linux,!windows
package fuzz
diff --git a/src/internal/fuzz/trace.go b/src/internal/fuzz/trace.go
index ab0aeb41bdd..cab0838fab4 100644
--- a/src/internal/fuzz/trace.go
+++ b/src/internal/fuzz/trace.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !libfuzzer
-// +build !libfuzzer
package fuzz
diff --git a/src/internal/goarch/gengoarch.go b/src/internal/goarch/gengoarch.go
index af15518ad8b..d146cc5bc90 100644
--- a/src/internal/goarch/gengoarch.go
+++ b/src/internal/goarch/gengoarch.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
package main
diff --git a/src/internal/goarch/zgoarch_386.go b/src/internal/goarch/zgoarch_386.go
index 364367722fe..4a9b0e67c45 100644
--- a/src/internal/goarch/zgoarch_386.go
+++ b/src/internal/goarch/zgoarch_386.go
@@ -1,7 +1,6 @@
// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT.
//go:build 386
-// +build 386
package goarch
diff --git a/src/internal/goarch/zgoarch_amd64.go b/src/internal/goarch/zgoarch_amd64.go
index 8169580857c..7926392b775 100644
--- a/src/internal/goarch/zgoarch_amd64.go
+++ b/src/internal/goarch/zgoarch_amd64.go
@@ -1,7 +1,6 @@
// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT.
//go:build amd64
-// +build amd64
package goarch
diff --git a/src/internal/goarch/zgoarch_arm.go b/src/internal/goarch/zgoarch_arm.go
index edc69f33491..6c03b8b060c 100644
--- a/src/internal/goarch/zgoarch_arm.go
+++ b/src/internal/goarch/zgoarch_arm.go
@@ -1,7 +1,6 @@
// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT.
//go:build arm
-// +build arm
package goarch
diff --git a/src/internal/goarch/zgoarch_arm64.go b/src/internal/goarch/zgoarch_arm64.go
index 0459376349d..ad342d79c96 100644
--- a/src/internal/goarch/zgoarch_arm64.go
+++ b/src/internal/goarch/zgoarch_arm64.go
@@ -1,7 +1,6 @@
// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT.
//go:build arm64
-// +build arm64
package goarch
diff --git a/src/internal/goarch/zgoarch_arm64be.go b/src/internal/goarch/zgoarch_arm64be.go
index b9439c147ef..0f260030908 100644
--- a/src/internal/goarch/zgoarch_arm64be.go
+++ b/src/internal/goarch/zgoarch_arm64be.go
@@ -1,7 +1,6 @@
// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT.
//go:build arm64be
-// +build arm64be
package goarch
diff --git a/src/internal/goarch/zgoarch_armbe.go b/src/internal/goarch/zgoarch_armbe.go
index bbb07603d6a..6092fee7516 100644
--- a/src/internal/goarch/zgoarch_armbe.go
+++ b/src/internal/goarch/zgoarch_armbe.go
@@ -1,7 +1,6 @@
// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT.
//go:build armbe
-// +build armbe
package goarch
diff --git a/src/internal/goarch/zgoarch_loong64.go b/src/internal/goarch/zgoarch_loong64.go
index 4d2cd70a009..21c67e11768 100644
--- a/src/internal/goarch/zgoarch_loong64.go
+++ b/src/internal/goarch/zgoarch_loong64.go
@@ -1,7 +1,6 @@
// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT.
//go:build loong64
-// +build loong64
package goarch
diff --git a/src/internal/goarch/zgoarch_mips.go b/src/internal/goarch/zgoarch_mips.go
index 25a8071727d..0db19746556 100644
--- a/src/internal/goarch/zgoarch_mips.go
+++ b/src/internal/goarch/zgoarch_mips.go
@@ -1,7 +1,6 @@
// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT.
//go:build mips
-// +build mips
package goarch
diff --git a/src/internal/goarch/zgoarch_mips64.go b/src/internal/goarch/zgoarch_mips64.go
index 907ae30ec45..738806f0aef 100644
--- a/src/internal/goarch/zgoarch_mips64.go
+++ b/src/internal/goarch/zgoarch_mips64.go
@@ -1,7 +1,6 @@
// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT.
//go:build mips64
-// +build mips64
package goarch
diff --git a/src/internal/goarch/zgoarch_mips64le.go b/src/internal/goarch/zgoarch_mips64le.go
index 3f4c369d160..8de5beb8819 100644
--- a/src/internal/goarch/zgoarch_mips64le.go
+++ b/src/internal/goarch/zgoarch_mips64le.go
@@ -1,7 +1,6 @@
// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT.
//go:build mips64le
-// +build mips64le
package goarch
diff --git a/src/internal/goarch/zgoarch_mips64p32.go b/src/internal/goarch/zgoarch_mips64p32.go
index d03e503c597..ea461bed70c 100644
--- a/src/internal/goarch/zgoarch_mips64p32.go
+++ b/src/internal/goarch/zgoarch_mips64p32.go
@@ -1,7 +1,6 @@
// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT.
//go:build mips64p32
-// +build mips64p32
package goarch
diff --git a/src/internal/goarch/zgoarch_mips64p32le.go b/src/internal/goarch/zgoarch_mips64p32le.go
index bbaa010adad..15473ce6c7a 100644
--- a/src/internal/goarch/zgoarch_mips64p32le.go
+++ b/src/internal/goarch/zgoarch_mips64p32le.go
@@ -1,7 +1,6 @@
// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT.
//go:build mips64p32le
-// +build mips64p32le
package goarch
diff --git a/src/internal/goarch/zgoarch_mipsle.go b/src/internal/goarch/zgoarch_mipsle.go
index b22be64d6e1..4955142e876 100644
--- a/src/internal/goarch/zgoarch_mipsle.go
+++ b/src/internal/goarch/zgoarch_mipsle.go
@@ -1,7 +1,6 @@
// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT.
//go:build mipsle
-// +build mipsle
package goarch
diff --git a/src/internal/goarch/zgoarch_ppc.go b/src/internal/goarch/zgoarch_ppc.go
index ed50bf82753..ec01763b3c3 100644
--- a/src/internal/goarch/zgoarch_ppc.go
+++ b/src/internal/goarch/zgoarch_ppc.go
@@ -1,7 +1,6 @@
// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT.
//go:build ppc
-// +build ppc
package goarch
diff --git a/src/internal/goarch/zgoarch_ppc64.go b/src/internal/goarch/zgoarch_ppc64.go
index 26b921d343e..39be3925c8e 100644
--- a/src/internal/goarch/zgoarch_ppc64.go
+++ b/src/internal/goarch/zgoarch_ppc64.go
@@ -1,7 +1,6 @@
// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT.
//go:build ppc64
-// +build ppc64
package goarch
diff --git a/src/internal/goarch/zgoarch_ppc64le.go b/src/internal/goarch/zgoarch_ppc64le.go
index de4fe0fb801..5f959e0e024 100644
--- a/src/internal/goarch/zgoarch_ppc64le.go
+++ b/src/internal/goarch/zgoarch_ppc64le.go
@@ -1,7 +1,6 @@
// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT.
//go:build ppc64le
-// +build ppc64le
package goarch
diff --git a/src/internal/goarch/zgoarch_riscv.go b/src/internal/goarch/zgoarch_riscv.go
index 3eff4744672..8d81a14dd9b 100644
--- a/src/internal/goarch/zgoarch_riscv.go
+++ b/src/internal/goarch/zgoarch_riscv.go
@@ -1,7 +1,6 @@
// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT.
//go:build riscv
-// +build riscv
package goarch
diff --git a/src/internal/goarch/zgoarch_riscv64.go b/src/internal/goarch/zgoarch_riscv64.go
index d99ab9dc294..1df989c2a69 100644
--- a/src/internal/goarch/zgoarch_riscv64.go
+++ b/src/internal/goarch/zgoarch_riscv64.go
@@ -1,7 +1,6 @@
// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT.
//go:build riscv64
-// +build riscv64
package goarch
diff --git a/src/internal/goarch/zgoarch_s390.go b/src/internal/goarch/zgoarch_s390.go
index 6d4ff71cc9c..56815b9f435 100644
--- a/src/internal/goarch/zgoarch_s390.go
+++ b/src/internal/goarch/zgoarch_s390.go
@@ -1,7 +1,6 @@
// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT.
//go:build s390
-// +build s390
package goarch
diff --git a/src/internal/goarch/zgoarch_s390x.go b/src/internal/goarch/zgoarch_s390x.go
index 6c215060a36..e61e9bd5938 100644
--- a/src/internal/goarch/zgoarch_s390x.go
+++ b/src/internal/goarch/zgoarch_s390x.go
@@ -1,7 +1,6 @@
// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT.
//go:build s390x
-// +build s390x
package goarch
diff --git a/src/internal/goarch/zgoarch_sparc.go b/src/internal/goarch/zgoarch_sparc.go
index 029e790fb02..ee5b746566d 100644
--- a/src/internal/goarch/zgoarch_sparc.go
+++ b/src/internal/goarch/zgoarch_sparc.go
@@ -1,7 +1,6 @@
// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT.
//go:build sparc
-// +build sparc
package goarch
diff --git a/src/internal/goarch/zgoarch_sparc64.go b/src/internal/goarch/zgoarch_sparc64.go
index bcd7b6f7dfa..519aaa10c13 100644
--- a/src/internal/goarch/zgoarch_sparc64.go
+++ b/src/internal/goarch/zgoarch_sparc64.go
@@ -1,7 +1,6 @@
// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT.
//go:build sparc64
-// +build sparc64
package goarch
diff --git a/src/internal/goarch/zgoarch_wasm.go b/src/internal/goarch/zgoarch_wasm.go
index 0816c85a115..25567a1b648 100644
--- a/src/internal/goarch/zgoarch_wasm.go
+++ b/src/internal/goarch/zgoarch_wasm.go
@@ -1,7 +1,6 @@
// Code generated by gengoarch.go using 'go generate'. DO NOT EDIT.
//go:build wasm
-// +build wasm
package goarch
diff --git a/src/internal/goos/gengoos.go b/src/internal/goos/gengoos.go
index 1860cd700df..f8ddfcc7ff0 100644
--- a/src/internal/goos/gengoos.go
+++ b/src/internal/goos/gengoos.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
package main
diff --git a/src/internal/goos/zgoos_aix.go b/src/internal/goos/zgoos_aix.go
index 063e698b82c..ff861550c48 100644
--- a/src/internal/goos/zgoos_aix.go
+++ b/src/internal/goos/zgoos_aix.go
@@ -1,7 +1,6 @@
// Code generated by gengoos.go using 'go generate'. DO NOT EDIT.
//go:build aix
-// +build aix
package goos
diff --git a/src/internal/goos/zgoos_android.go b/src/internal/goos/zgoos_android.go
index e9e48649782..e8aaa124284 100644
--- a/src/internal/goos/zgoos_android.go
+++ b/src/internal/goos/zgoos_android.go
@@ -1,7 +1,6 @@
// Code generated by gengoos.go using 'go generate'. DO NOT EDIT.
//go:build android
-// +build android
package goos
diff --git a/src/internal/goos/zgoos_darwin.go b/src/internal/goos/zgoos_darwin.go
index 309d6a27172..decdd496425 100644
--- a/src/internal/goos/zgoos_darwin.go
+++ b/src/internal/goos/zgoos_darwin.go
@@ -1,7 +1,6 @@
// Code generated by gengoos.go using 'go generate'. DO NOT EDIT.
//go:build !ios && darwin
-// +build !ios,darwin
package goos
diff --git a/src/internal/goos/zgoos_dragonfly.go b/src/internal/goos/zgoos_dragonfly.go
index 4e8711b94c5..2224baa2301 100644
--- a/src/internal/goos/zgoos_dragonfly.go
+++ b/src/internal/goos/zgoos_dragonfly.go
@@ -1,7 +1,6 @@
// Code generated by gengoos.go using 'go generate'. DO NOT EDIT.
//go:build dragonfly
-// +build dragonfly
package goos
diff --git a/src/internal/goos/zgoos_freebsd.go b/src/internal/goos/zgoos_freebsd.go
index f312bd16081..3ee5bf998e2 100644
--- a/src/internal/goos/zgoos_freebsd.go
+++ b/src/internal/goos/zgoos_freebsd.go
@@ -1,7 +1,6 @@
// Code generated by gengoos.go using 'go generate'. DO NOT EDIT.
//go:build freebsd
-// +build freebsd
package goos
diff --git a/src/internal/goos/zgoos_hurd.go b/src/internal/goos/zgoos_hurd.go
index 0f0dd28b81b..8a3d34304d8 100644
--- a/src/internal/goos/zgoos_hurd.go
+++ b/src/internal/goos/zgoos_hurd.go
@@ -1,7 +1,6 @@
// Code generated by gengoos.go using 'go generate'. DO NOT EDIT.
//go:build hurd
-// +build hurd
package goos
diff --git a/src/internal/goos/zgoos_illumos.go b/src/internal/goos/zgoos_illumos.go
index 17e7c53a403..fc1b9a9e22f 100644
--- a/src/internal/goos/zgoos_illumos.go
+++ b/src/internal/goos/zgoos_illumos.go
@@ -1,7 +1,6 @@
// Code generated by gengoos.go using 'go generate'. DO NOT EDIT.
//go:build illumos
-// +build illumos
package goos
diff --git a/src/internal/goos/zgoos_ios.go b/src/internal/goos/zgoos_ios.go
index e4745ca4134..746e769ef76 100644
--- a/src/internal/goos/zgoos_ios.go
+++ b/src/internal/goos/zgoos_ios.go
@@ -1,7 +1,6 @@
// Code generated by gengoos.go using 'go generate'. DO NOT EDIT.
//go:build ios
-// +build ios
package goos
diff --git a/src/internal/goos/zgoos_js.go b/src/internal/goos/zgoos_js.go
index bd2417e9cea..6cf2a5d9e27 100644
--- a/src/internal/goos/zgoos_js.go
+++ b/src/internal/goos/zgoos_js.go
@@ -1,7 +1,6 @@
// Code generated by gengoos.go using 'go generate'. DO NOT EDIT.
//go:build js
-// +build js
package goos
diff --git a/src/internal/goos/zgoos_linux.go b/src/internal/goos/zgoos_linux.go
index 476702f442a..cb9d6e8afaa 100644
--- a/src/internal/goos/zgoos_linux.go
+++ b/src/internal/goos/zgoos_linux.go
@@ -1,7 +1,6 @@
// Code generated by gengoos.go using 'go generate'. DO NOT EDIT.
//go:build !android && linux
-// +build !android,linux
package goos
diff --git a/src/internal/goos/zgoos_netbsd.go b/src/internal/goos/zgoos_netbsd.go
index 97b7564babd..8285928d350 100644
--- a/src/internal/goos/zgoos_netbsd.go
+++ b/src/internal/goos/zgoos_netbsd.go
@@ -1,7 +1,6 @@
// Code generated by gengoos.go using 'go generate'. DO NOT EDIT.
//go:build netbsd
-// +build netbsd
package goos
diff --git a/src/internal/goos/zgoos_openbsd.go b/src/internal/goos/zgoos_openbsd.go
index 384a96480d6..3f739a4a2f7 100644
--- a/src/internal/goos/zgoos_openbsd.go
+++ b/src/internal/goos/zgoos_openbsd.go
@@ -1,7 +1,6 @@
// Code generated by gengoos.go using 'go generate'. DO NOT EDIT.
//go:build openbsd
-// +build openbsd
package goos
diff --git a/src/internal/goos/zgoos_plan9.go b/src/internal/goos/zgoos_plan9.go
index fcc279a79ec..d4c1c651f7b 100644
--- a/src/internal/goos/zgoos_plan9.go
+++ b/src/internal/goos/zgoos_plan9.go
@@ -1,7 +1,6 @@
// Code generated by gengoos.go using 'go generate'. DO NOT EDIT.
//go:build plan9
-// +build plan9
package goos
diff --git a/src/internal/goos/zgoos_solaris.go b/src/internal/goos/zgoos_solaris.go
index 3f366cf7101..69e3285ab62 100644
--- a/src/internal/goos/zgoos_solaris.go
+++ b/src/internal/goos/zgoos_solaris.go
@@ -1,7 +1,6 @@
// Code generated by gengoos.go using 'go generate'. DO NOT EDIT.
//go:build !illumos && solaris
-// +build !illumos,solaris
package goos
diff --git a/src/internal/goos/zgoos_windows.go b/src/internal/goos/zgoos_windows.go
index dfa55339d34..16158be78b9 100644
--- a/src/internal/goos/zgoos_windows.go
+++ b/src/internal/goos/zgoos_windows.go
@@ -1,7 +1,6 @@
// Code generated by gengoos.go using 'go generate'. DO NOT EDIT.
//go:build windows
-// +build windows
package goos
diff --git a/src/internal/goos/zgoos_zos.go b/src/internal/goos/zgoos_zos.go
index 714f24963a2..fb6165c7a12 100644
--- a/src/internal/goos/zgoos_zos.go
+++ b/src/internal/goos/zgoos_zos.go
@@ -1,7 +1,6 @@
// Code generated by gengoos.go using 'go generate'. DO NOT EDIT.
//go:build zos
-// +build zos
package goos
diff --git a/src/internal/goroot/gc.go b/src/internal/goroot/gc.go
index 2338b78f3aa..8c66cd13a81 100644
--- a/src/internal/goroot/gc.go
+++ b/src/internal/goroot/gc.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build gc
-// +build gc
package goroot
diff --git a/src/internal/goroot/gccgo.go b/src/internal/goroot/gccgo.go
index b1041da11d8..62841222a7e 100644
--- a/src/internal/goroot/gccgo.go
+++ b/src/internal/goroot/gccgo.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build gccgo
-// +build gccgo
package goroot
diff --git a/src/internal/poll/errno_unix.go b/src/internal/poll/errno_unix.go
index 55c548824f8..c1775197322 100644
--- a/src/internal/poll/errno_unix.go
+++ b/src/internal/poll/errno_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package poll
diff --git a/src/internal/poll/errno_windows.go b/src/internal/poll/errno_windows.go
index c55f5f0df50..3679aa8c4c7 100644
--- a/src/internal/poll/errno_windows.go
+++ b/src/internal/poll/errno_windows.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build windows
-// +build windows
package poll
diff --git a/src/internal/poll/error_stub_test.go b/src/internal/poll/error_stub_test.go
index bcc25dd666a..48e095254d3 100644
--- a/src/internal/poll/error_stub_test.go
+++ b/src/internal/poll/error_stub_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !linux
-// +build !linux
package poll_test
diff --git a/src/internal/poll/export_posix_test.go b/src/internal/poll/export_posix_test.go
index f59c1f6dfab..3fcafac0020 100644
--- a/src/internal/poll/export_posix_test.go
+++ b/src/internal/poll/export_posix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || windows
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows
// Export guts for testing on posix.
// Since testing imports os and os imports internal/poll,
diff --git a/src/internal/poll/fcntl_js.go b/src/internal/poll/fcntl_js.go
index 7bf0ddc792f..0f42ef61a57 100644
--- a/src/internal/poll/fcntl_js.go
+++ b/src/internal/poll/fcntl_js.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js && wasm
-// +build js,wasm
package poll
diff --git a/src/internal/poll/fcntl_libc.go b/src/internal/poll/fcntl_libc.go
index cc609e48ad7..f503d7a336f 100644
--- a/src/internal/poll/fcntl_libc.go
+++ b/src/internal/poll/fcntl_libc.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || solaris
-// +build aix darwin solaris
package poll
diff --git a/src/internal/poll/fcntl_syscall.go b/src/internal/poll/fcntl_syscall.go
index 8db5b665049..accff5e0438 100644
--- a/src/internal/poll/fcntl_syscall.go
+++ b/src/internal/poll/fcntl_syscall.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd || linux || netbsd || openbsd
-// +build dragonfly freebsd linux netbsd openbsd
package poll
diff --git a/src/internal/poll/fd_fsync_posix.go b/src/internal/poll/fd_fsync_posix.go
index 651a5ecd8b2..6f17019e73d 100644
--- a/src/internal/poll/fd_fsync_posix.go
+++ b/src/internal/poll/fd_fsync_posix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris
-// +build aix dragonfly freebsd js,wasm linux netbsd openbsd solaris
package poll
diff --git a/src/internal/poll/fd_poll_js.go b/src/internal/poll/fd_poll_js.go
index 760e24802e3..84bfcae633d 100644
--- a/src/internal/poll/fd_poll_js.go
+++ b/src/internal/poll/fd_poll_js.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js && wasm
-// +build js,wasm
package poll
diff --git a/src/internal/poll/fd_poll_runtime.go b/src/internal/poll/fd_poll_runtime.go
index b072af00ea5..4a4dddfd274 100644
--- a/src/internal/poll/fd_poll_runtime.go
+++ b/src/internal/poll/fd_poll_runtime.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || windows || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd windows solaris
package poll
diff --git a/src/internal/poll/fd_posix.go b/src/internal/poll/fd_posix.go
index 487f3285ee9..dc1e29c6b78 100644
--- a/src/internal/poll/fd_posix.go
+++ b/src/internal/poll/fd_posix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris || windows
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris windows
package poll
diff --git a/src/internal/poll/fd_posix_test.go b/src/internal/poll/fd_posix_test.go
index 1dcf51d4194..0b7ef7a577f 100644
--- a/src/internal/poll/fd_posix_test.go
+++ b/src/internal/poll/fd_posix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || windows
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows
package poll_test
diff --git a/src/internal/poll/fd_unix.go b/src/internal/poll/fd_unix.go
index 5489662889b..d4c32e4d412 100644
--- a/src/internal/poll/fd_unix.go
+++ b/src/internal/poll/fd_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris
package poll
diff --git a/src/internal/poll/fd_writev_darwin.go b/src/internal/poll/fd_writev_darwin.go
index 805fa2ccd9a..8137510c8b4 100644
--- a/src/internal/poll/fd_writev_darwin.go
+++ b/src/internal/poll/fd_writev_darwin.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin
-// +build darwin
package poll
diff --git a/src/internal/poll/fd_writev_illumos.go b/src/internal/poll/fd_writev_illumos.go
index a0b11ed5ae9..79190c2f639 100644
--- a/src/internal/poll/fd_writev_illumos.go
+++ b/src/internal/poll/fd_writev_illumos.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build illumos
-// +build illumos
package poll
diff --git a/src/internal/poll/fd_writev_unix.go b/src/internal/poll/fd_writev_unix.go
index 87f284a56a1..aa96d104c89 100644
--- a/src/internal/poll/fd_writev_unix.go
+++ b/src/internal/poll/fd_writev_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd || linux || netbsd || openbsd
-// +build dragonfly freebsd linux netbsd openbsd
package poll
diff --git a/src/internal/poll/hook_cloexec.go b/src/internal/poll/hook_cloexec.go
index d519f602c1e..c941cb52357 100644
--- a/src/internal/poll/hook_cloexec.go
+++ b/src/internal/poll/hook_cloexec.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd || illumos || linux || netbsd || openbsd
-// +build dragonfly freebsd illumos linux netbsd openbsd
package poll
diff --git a/src/internal/poll/hook_unix.go b/src/internal/poll/hook_unix.go
index c88d65cdc83..c9aa4b4ca23 100644
--- a/src/internal/poll/hook_unix.go
+++ b/src/internal/poll/hook_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris
package poll
diff --git a/src/internal/poll/iovec_illumos.go b/src/internal/poll/iovec_illumos.go
index f4058b298f3..00a65d7995b 100644
--- a/src/internal/poll/iovec_illumos.go
+++ b/src/internal/poll/iovec_illumos.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build illumos
-// +build illumos
package poll
diff --git a/src/internal/poll/iovec_unix.go b/src/internal/poll/iovec_unix.go
index 6fd5d86630b..c1500840ac2 100644
--- a/src/internal/poll/iovec_unix.go
+++ b/src/internal/poll/iovec_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd
-// +build darwin dragonfly freebsd linux netbsd openbsd
package poll
diff --git a/src/internal/poll/sendfile_bsd.go b/src/internal/poll/sendfile_bsd.go
index 5531e533c5c..89315a8c673 100644
--- a/src/internal/poll/sendfile_bsd.go
+++ b/src/internal/poll/sendfile_bsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd
-// +build darwin dragonfly freebsd
package poll
diff --git a/src/internal/poll/sock_cloexec.go b/src/internal/poll/sock_cloexec.go
index b3038290b92..d849fda0b06 100644
--- a/src/internal/poll/sock_cloexec.go
+++ b/src/internal/poll/sock_cloexec.go
@@ -6,7 +6,6 @@
// setting SetNonblock and CloseOnExec.
//go:build dragonfly || freebsd || illumos || linux || netbsd || openbsd
-// +build dragonfly freebsd illumos linux netbsd openbsd
package poll
diff --git a/src/internal/poll/sockopt.go b/src/internal/poll/sockopt.go
index 4f2e2fb455d..2d354700c5d 100644
--- a/src/internal/poll/sockopt.go
+++ b/src/internal/poll/sockopt.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || windows
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows
package poll
diff --git a/src/internal/poll/sockopt_unix.go b/src/internal/poll/sockopt_unix.go
index 4fb9600deed..54be1cc4b6b 100644
--- a/src/internal/poll/sockopt_unix.go
+++ b/src/internal/poll/sockopt_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package poll
diff --git a/src/internal/poll/sockoptip.go b/src/internal/poll/sockoptip.go
index d86c4c1f81a..7fc9aeefb3b 100644
--- a/src/internal/poll/sockoptip.go
+++ b/src/internal/poll/sockoptip.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || windows
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows
package poll
diff --git a/src/internal/poll/strconv.go b/src/internal/poll/strconv.go
index c98332d3dac..2b052fa1747 100644
--- a/src/internal/poll/strconv.go
+++ b/src/internal/poll/strconv.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build plan9
-// +build plan9
package poll
diff --git a/src/internal/poll/sys_cloexec.go b/src/internal/poll/sys_cloexec.go
index 7e6d422d621..312ed24a44b 100644
--- a/src/internal/poll/sys_cloexec.go
+++ b/src/internal/poll/sys_cloexec.go
@@ -6,7 +6,6 @@
// setting SetNonblock and CloseOnExec.
//go:build aix || darwin || (js && wasm) || (solaris && !illumos)
-// +build aix darwin js,wasm solaris,!illumos
package poll
diff --git a/src/internal/poll/writev.go b/src/internal/poll/writev.go
index 824de7569e8..cd600b63d7d 100644
--- a/src/internal/poll/writev.go
+++ b/src/internal/poll/writev.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || illumos || linux || netbsd || openbsd
-// +build darwin dragonfly freebsd illumos linux netbsd openbsd
package poll
diff --git a/src/internal/syscall/execenv/execenv_default.go b/src/internal/syscall/execenv/execenv_default.go
index 73289f1cd05..335647c6381 100644
--- a/src/internal/syscall/execenv/execenv_default.go
+++ b/src/internal/syscall/execenv/execenv_default.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !windows
-// +build !windows
package execenv
diff --git a/src/internal/syscall/execenv/execenv_windows.go b/src/internal/syscall/execenv/execenv_windows.go
index 6c0654943e6..a8aa1a644ee 100644
--- a/src/internal/syscall/execenv/execenv_windows.go
+++ b/src/internal/syscall/execenv/execenv_windows.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build windows
-// +build windows
package execenv
diff --git a/src/internal/syscall/unix/at.go b/src/internal/syscall/unix/at.go
index 9b08864f7f5..447d48e1989 100644
--- a/src/internal/syscall/unix/at.go
+++ b/src/internal/syscall/unix/at.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux || openbsd || netbsd || dragonfly
-// +build linux openbsd netbsd dragonfly
package unix
diff --git a/src/internal/syscall/unix/at_libc.go b/src/internal/syscall/unix/at_libc.go
index 4cc351ea278..f48d3791e37 100644
--- a/src/internal/syscall/unix/at_libc.go
+++ b/src/internal/syscall/unix/at_libc.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || solaris
-// +build aix solaris
package unix
diff --git a/src/internal/syscall/unix/at_sysnum_fstatat64_linux.go b/src/internal/syscall/unix/at_sysnum_fstatat64_linux.go
index 050d401bc0e..445b0c38546 100644
--- a/src/internal/syscall/unix/at_sysnum_fstatat64_linux.go
+++ b/src/internal/syscall/unix/at_sysnum_fstatat64_linux.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build arm || mips || mipsle || 386
-// +build arm mips mipsle 386
package unix
diff --git a/src/internal/syscall/unix/at_sysnum_fstatat_linux.go b/src/internal/syscall/unix/at_sysnum_fstatat_linux.go
index e53a2d1b75f..73a3da5bff2 100644
--- a/src/internal/syscall/unix/at_sysnum_fstatat_linux.go
+++ b/src/internal/syscall/unix/at_sysnum_fstatat_linux.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build arm64 || riscv64
-// +build arm64 riscv64
package unix
diff --git a/src/internal/syscall/unix/at_sysnum_newfstatat_linux.go b/src/internal/syscall/unix/at_sysnum_newfstatat_linux.go
index 4cb4a5976ba..76edf675227 100644
--- a/src/internal/syscall/unix/at_sysnum_newfstatat_linux.go
+++ b/src/internal/syscall/unix/at_sysnum_newfstatat_linux.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64 || mips64 || mips64le || ppc64 || ppc64le || s390x
-// +build amd64 mips64 mips64le ppc64 ppc64le s390x
package unix
diff --git a/src/internal/syscall/unix/fcntl_linux_32bit.go b/src/internal/syscall/unix/fcntl_linux_32bit.go
index 46a4f6b030d..7b39ee72bc4 100644
--- a/src/internal/syscall/unix/fcntl_linux_32bit.go
+++ b/src/internal/syscall/unix/fcntl_linux_32bit.go
@@ -6,7 +6,6 @@
// If you change the build tags here, see syscall/flock_linux_32bit.go.
//go:build (linux && 386) || (linux && arm) || (linux && mips) || (linux && mipsle)
-// +build linux,386 linux,arm linux,mips linux,mipsle
package unix
diff --git a/src/internal/syscall/unix/getentropy_darwin.go b/src/internal/syscall/unix/getentropy_darwin.go
index c75006bf8b6..7bab1f27b0c 100644
--- a/src/internal/syscall/unix/getentropy_darwin.go
+++ b/src/internal/syscall/unix/getentropy_darwin.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin && !ios
-// +build darwin,!ios
package unix
diff --git a/src/internal/syscall/unix/getrandom.go b/src/internal/syscall/unix/getrandom.go
index d2c58c0f6fa..a6659331e46 100644
--- a/src/internal/syscall/unix/getrandom.go
+++ b/src/internal/syscall/unix/getrandom.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd || linux
-// +build dragonfly freebsd linux
package unix
diff --git a/src/internal/syscall/unix/nonblocking.go b/src/internal/syscall/unix/nonblocking.go
index a22986cb8a4..9e5f0fb4a2d 100644
--- a/src/internal/syscall/unix/nonblocking.go
+++ b/src/internal/syscall/unix/nonblocking.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd || linux || netbsd || openbsd
-// +build dragonfly freebsd linux netbsd openbsd
package unix
diff --git a/src/internal/syscall/unix/nonblocking_js.go b/src/internal/syscall/unix/nonblocking_js.go
index a5a5080d461..8ed40f3f910 100644
--- a/src/internal/syscall/unix/nonblocking_js.go
+++ b/src/internal/syscall/unix/nonblocking_js.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js && wasm
-// +build js,wasm
package unix
diff --git a/src/internal/syscall/unix/nonblocking_libc.go b/src/internal/syscall/unix/nonblocking_libc.go
index d9565efcb6a..75c6e92a6e2 100644
--- a/src/internal/syscall/unix/nonblocking_libc.go
+++ b/src/internal/syscall/unix/nonblocking_libc.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || solaris
-// +build aix darwin solaris
package unix
diff --git a/src/internal/syscall/unix/pipe2_illumos.go b/src/internal/syscall/unix/pipe2_illumos.go
index b0aac895808..c6280f85e58 100644
--- a/src/internal/syscall/unix/pipe2_illumos.go
+++ b/src/internal/syscall/unix/pipe2_illumos.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build illumos
-// +build illumos
package unix
diff --git a/src/internal/syscall/unix/sysnum_linux_generic.go b/src/internal/syscall/unix/sysnum_linux_generic.go
index a76025454ca..3c5394a96b1 100644
--- a/src/internal/syscall/unix/sysnum_linux_generic.go
+++ b/src/internal/syscall/unix/sysnum_linux_generic.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux && (arm64 || riscv64)
-// +build linux
-// +build arm64 riscv64
package unix
diff --git a/src/internal/syscall/unix/sysnum_linux_mips64x.go b/src/internal/syscall/unix/sysnum_linux_mips64x.go
index f353d4d73e4..bca526d2b90 100644
--- a/src/internal/syscall/unix/sysnum_linux_mips64x.go
+++ b/src/internal/syscall/unix/sysnum_linux_mips64x.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build mips64 || mips64le
-// +build mips64 mips64le
package unix
diff --git a/src/internal/syscall/unix/sysnum_linux_mipsx.go b/src/internal/syscall/unix/sysnum_linux_mipsx.go
index 4ed471532a2..c86195e4969 100644
--- a/src/internal/syscall/unix/sysnum_linux_mipsx.go
+++ b/src/internal/syscall/unix/sysnum_linux_mipsx.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build mips || mipsle
-// +build mips mipsle
package unix
diff --git a/src/internal/syscall/unix/sysnum_linux_ppc64x.go b/src/internal/syscall/unix/sysnum_linux_ppc64x.go
index b484ffef80b..a4dcf2bc9d7 100644
--- a/src/internal/syscall/unix/sysnum_linux_ppc64x.go
+++ b/src/internal/syscall/unix/sysnum_linux_ppc64x.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ppc64 || ppc64le
-// +build ppc64 ppc64le
package unix
diff --git a/src/internal/syscall/unix/writev_illumos.go b/src/internal/syscall/unix/writev_illumos.go
index f60949f662b..ee31be1302e 100644
--- a/src/internal/syscall/unix/writev_illumos.go
+++ b/src/internal/syscall/unix/writev_illumos.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build illumos
-// +build illumos
package unix
diff --git a/src/internal/testenv/testenv_cgo.go b/src/internal/testenv/testenv_cgo.go
index 02f08f57c71..7426a29c1a6 100644
--- a/src/internal/testenv/testenv_cgo.go
+++ b/src/internal/testenv/testenv_cgo.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build cgo
-// +build cgo
package testenv
diff --git a/src/internal/testenv/testenv_notwin.go b/src/internal/testenv/testenv_notwin.go
index 846ec938564..81171fd193f 100644
--- a/src/internal/testenv/testenv_notwin.go
+++ b/src/internal/testenv/testenv_notwin.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !windows
-// +build !windows
package testenv
diff --git a/src/log/syslog/example_test.go b/src/log/syslog/example_test.go
index 993976569e2..4df29c0af0b 100644
--- a/src/log/syslog/example_test.go
+++ b/src/log/syslog/example_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !windows && !plan9
-// +build !windows,!plan9
package syslog_test
diff --git a/src/log/syslog/syslog.go b/src/log/syslog/syslog.go
index 6abd4ad1248..8c6ba721352 100644
--- a/src/log/syslog/syslog.go
+++ b/src/log/syslog/syslog.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !windows && !plan9
-// +build !windows,!plan9
package syslog
diff --git a/src/log/syslog/syslog_test.go b/src/log/syslog/syslog_test.go
index 62c62508452..26530480ee9 100644
--- a/src/log/syslog/syslog_test.go
+++ b/src/log/syslog/syslog_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
package syslog
diff --git a/src/log/syslog/syslog_unix.go b/src/log/syslog/syslog_unix.go
index 2e45f0764fd..f9cdcdc2734 100644
--- a/src/log/syslog/syslog_unix.go
+++ b/src/log/syslog/syslog_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !windows && !plan9
-// +build !windows,!plan9
package syslog
diff --git a/src/math/cmplx/huge_test.go b/src/math/cmplx/huge_test.go
index 78b42316de5..e794cf281ab 100644
--- a/src/math/cmplx/huge_test.go
+++ b/src/math/cmplx/huge_test.go
@@ -6,7 +6,6 @@
// accurate for huge arguments.
//go:build !s390x
-// +build !s390x
package cmplx
diff --git a/src/math/dim_asm.go b/src/math/dim_asm.go
index 9ba742a407a..f4adbd0ae5e 100644
--- a/src/math/dim_asm.go
+++ b/src/math/dim_asm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64 || arm64 || riscv64 || s390x
-// +build amd64 arm64 riscv64 s390x
package math
diff --git a/src/math/dim_noasm.go b/src/math/dim_noasm.go
index ea46577d8de..5b9e06fed33 100644
--- a/src/math/dim_noasm.go
+++ b/src/math/dim_noasm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !amd64 && !arm64 && !riscv64 && !s390x
-// +build !amd64,!arm64,!riscv64,!s390x
package math
diff --git a/src/math/exp2_asm.go b/src/math/exp2_asm.go
index 76d258f1252..c26b2c3fab6 100644
--- a/src/math/exp2_asm.go
+++ b/src/math/exp2_asm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build arm64
-// +build arm64
package math
diff --git a/src/math/exp2_noasm.go b/src/math/exp2_noasm.go
index 1b0ac87ebf0..c2b409329f1 100644
--- a/src/math/exp2_noasm.go
+++ b/src/math/exp2_noasm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !arm64
-// +build !arm64
package math
diff --git a/src/math/exp_amd64.go b/src/math/exp_amd64.go
index 654ccce4810..0f701b1d6d8 100644
--- a/src/math/exp_amd64.go
+++ b/src/math/exp_amd64.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64
-// +build amd64
package math
diff --git a/src/math/exp_asm.go b/src/math/exp_asm.go
index a1673ea1ddb..424442845bb 100644
--- a/src/math/exp_asm.go
+++ b/src/math/exp_asm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64 || arm64 || s390x
-// +build amd64 arm64 s390x
package math
diff --git a/src/math/exp_noasm.go b/src/math/exp_noasm.go
index b757e6e2303..bd3f02412a2 100644
--- a/src/math/exp_noasm.go
+++ b/src/math/exp_noasm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !amd64 && !arm64 && !s390x
-// +build !amd64,!arm64,!s390x
package math
diff --git a/src/math/floor_asm.go b/src/math/floor_asm.go
index 1265e5171e9..fb419d6da2f 100644
--- a/src/math/floor_asm.go
+++ b/src/math/floor_asm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build 386 || amd64 || arm64 || ppc64 || ppc64le || s390x || wasm
-// +build 386 amd64 arm64 ppc64 ppc64le s390x wasm
package math
diff --git a/src/math/floor_noasm.go b/src/math/floor_noasm.go
index 821af210200..5641c7ea0a4 100644
--- a/src/math/floor_noasm.go
+++ b/src/math/floor_noasm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !386 && !amd64 && !arm64 && !ppc64 && !ppc64le && !s390x && !wasm
-// +build !386,!amd64,!arm64,!ppc64,!ppc64le,!s390x,!wasm
package math
diff --git a/src/math/huge_test.go b/src/math/huge_test.go
index ec81a4a31da..bc28c6ff693 100644
--- a/src/math/huge_test.go
+++ b/src/math/huge_test.go
@@ -6,7 +6,6 @@
// accurate for huge arguments.
//go:build !s390x
-// +build !s390x
package math_test
diff --git a/src/math/hypot_asm.go b/src/math/hypot_asm.go
index 9435af41cf8..852691037f6 100644
--- a/src/math/hypot_asm.go
+++ b/src/math/hypot_asm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build 386 || amd64
-// +build 386 amd64
package math
diff --git a/src/math/hypot_noasm.go b/src/math/hypot_noasm.go
index bc41b136e56..8b64812a1c1 100644
--- a/src/math/hypot_noasm.go
+++ b/src/math/hypot_noasm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !386 && !amd64
-// +build !386,!amd64
package math
diff --git a/src/math/log_asm.go b/src/math/log_asm.go
index 4d3b7ee065a..848cce13b28 100644
--- a/src/math/log_asm.go
+++ b/src/math/log_asm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64 || s390x
-// +build amd64 s390x
package math
diff --git a/src/math/log_stub.go b/src/math/log_stub.go
index e1697164364..d35992bf37a 100644
--- a/src/math/log_stub.go
+++ b/src/math/log_stub.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !amd64 && !s390x
-// +build !amd64,!s390x
package math
diff --git a/src/math/modf_asm.go b/src/math/modf_asm.go
index ce431a9d8d4..c63be6cf361 100644
--- a/src/math/modf_asm.go
+++ b/src/math/modf_asm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build arm64 || ppc64 || ppc64le
-// +build arm64 ppc64 ppc64le
package math
diff --git a/src/math/modf_noasm.go b/src/math/modf_noasm.go
index 9607a0894b2..55c6a7f6e20 100644
--- a/src/math/modf_noasm.go
+++ b/src/math/modf_noasm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !arm64 && !ppc64 && !ppc64le
-// +build !arm64,!ppc64,!ppc64le
package math
diff --git a/src/math/rand/gen_cooked.go b/src/math/rand/gen_cooked.go
index 7950e09fd7c..782bb6671d2 100644
--- a/src/math/rand/gen_cooked.go
+++ b/src/math/rand/gen_cooked.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
// This program computes the value of rngCooked in rng.go,
// which is used for seeding all instances of rand.Source.
diff --git a/src/math/sqrt_asm.go b/src/math/sqrt_asm.go
index b9102568ed5..2cec1a5903d 100644
--- a/src/math/sqrt_asm.go
+++ b/src/math/sqrt_asm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build 386 || amd64 || arm64 || arm || mips || mipsle || ppc64 || ppc64le || s390x || riscv64 || wasm
-// +build 386 amd64 arm64 arm mips mipsle ppc64 ppc64le s390x riscv64 wasm
package math
diff --git a/src/math/sqrt_noasm.go b/src/math/sqrt_noasm.go
index 7b546b7e8cb..39796220231 100644
--- a/src/math/sqrt_noasm.go
+++ b/src/math/sqrt_noasm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !386 && !amd64 && !arm64 && !arm && !mips && !mipsle && !ppc64 && !ppc64le && !s390x && !riscv64 && !wasm
-// +build !386,!amd64,!arm64,!arm,!mips,!mipsle,!ppc64,!ppc64le,!s390x,!riscv64,!wasm
package math
diff --git a/src/math/stubs.go b/src/math/stubs.go
index e1345eb841d..c4350d4b875 100644
--- a/src/math/stubs.go
+++ b/src/math/stubs.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !s390x
-// +build !s390x
// This is a large group of functions that most architectures don't
// implement in assembly.
diff --git a/src/mime/type_unix.go b/src/mime/type_unix.go
index f954bc8a1fb..3abc1fa10e4 100644
--- a/src/mime/type_unix.go
+++ b/src/mime/type_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris
package mime
diff --git a/src/mime/type_unix_test.go b/src/mime/type_unix_test.go
index 6e2988225c3..4d109aa71a2 100644
--- a/src/mime/type_unix_test.go
+++ b/src/mime/type_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris
package mime
diff --git a/src/net/addrselect.go b/src/net/addrselect.go
index ae93c595afa..29e4ed85abc 100644
--- a/src/net/addrselect.go
+++ b/src/net/addrselect.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
// Minimal RFC 6724 address selection.
diff --git a/src/net/addrselect_test.go b/src/net/addrselect_test.go
index dc13917018b..2894d5d846a 100644
--- a/src/net/addrselect_test.go
+++ b/src/net/addrselect_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
package net
diff --git a/src/net/cgo_aix.go b/src/net/cgo_aix.go
index a94405ecc04..f3478148b4f 100644
--- a/src/net/cgo_aix.go
+++ b/src/net/cgo_aix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build cgo && !netgo
-// +build cgo,!netgo
package net
diff --git a/src/net/cgo_android.go b/src/net/cgo_android.go
index 4b1a2e3e1d4..5ab8b5fedea 100644
--- a/src/net/cgo_android.go
+++ b/src/net/cgo_android.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build cgo && !netgo
-// +build cgo,!netgo
package net
diff --git a/src/net/cgo_bsd.go b/src/net/cgo_bsd.go
index 23be72140b6..1456289b069 100644
--- a/src/net/cgo_bsd.go
+++ b/src/net/cgo_bsd.go
@@ -3,9 +3,6 @@
// license that can be found in the LICENSE file.
//go:build cgo && !netgo && (darwin || dragonfly || freebsd)
-// +build cgo
-// +build !netgo
-// +build darwin dragonfly freebsd
package net
diff --git a/src/net/cgo_linux.go b/src/net/cgo_linux.go
index 1bd6be93f78..de6e87f1762 100644
--- a/src/net/cgo_linux.go
+++ b/src/net/cgo_linux.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !android && cgo && !netgo
-// +build !android,cgo,!netgo
package net
diff --git a/src/net/cgo_netbsd.go b/src/net/cgo_netbsd.go
index 3714793a52f..03392e8ff34 100644
--- a/src/net/cgo_netbsd.go
+++ b/src/net/cgo_netbsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build cgo && !netgo
-// +build cgo,!netgo
package net
diff --git a/src/net/cgo_openbsd.go b/src/net/cgo_openbsd.go
index 3714793a52f..03392e8ff34 100644
--- a/src/net/cgo_openbsd.go
+++ b/src/net/cgo_openbsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build cgo && !netgo
-// +build cgo,!netgo
package net
diff --git a/src/net/cgo_resnew.go b/src/net/cgo_resnew.go
index 154405270f1..fa6e68770ce 100644
--- a/src/net/cgo_resnew.go
+++ b/src/net/cgo_resnew.go
@@ -3,9 +3,6 @@
// license that can be found in the LICENSE file.
//go:build cgo && !netgo && (darwin || (linux && !android) || netbsd || solaris)
-// +build cgo
-// +build !netgo
-// +build darwin linux,!android netbsd solaris
package net
diff --git a/src/net/cgo_resold.go b/src/net/cgo_resold.go
index c4aab33eaa0..37c75527f95 100644
--- a/src/net/cgo_resold.go
+++ b/src/net/cgo_resold.go
@@ -3,9 +3,6 @@
// license that can be found in the LICENSE file.
//go:build cgo && !netgo && (android || freebsd || dragonfly || openbsd)
-// +build cgo
-// +build !netgo
-// +build android freebsd dragonfly openbsd
package net
diff --git a/src/net/cgo_socknew.go b/src/net/cgo_socknew.go
index f9cfad9909c..fbb9e10f340 100644
--- a/src/net/cgo_socknew.go
+++ b/src/net/cgo_socknew.go
@@ -3,9 +3,6 @@
// license that can be found in the LICENSE file.
//go:build cgo && !netgo && (android || linux || solaris)
-// +build cgo
-// +build !netgo
-// +build android linux solaris
package net
diff --git a/src/net/cgo_sockold.go b/src/net/cgo_sockold.go
index 22c67252f55..4d9869de04f 100644
--- a/src/net/cgo_sockold.go
+++ b/src/net/cgo_sockold.go
@@ -3,9 +3,6 @@
// license that can be found in the LICENSE file.
//go:build cgo && !netgo && (aix || darwin || dragonfly || freebsd || netbsd || openbsd)
-// +build cgo
-// +build !netgo
-// +build aix darwin dragonfly freebsd netbsd openbsd
package net
diff --git a/src/net/cgo_solaris.go b/src/net/cgo_solaris.go
index a84f5b0d34c..cde9c957fee 100644
--- a/src/net/cgo_solaris.go
+++ b/src/net/cgo_solaris.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build cgo && !netgo
-// +build cgo,!netgo
package net
diff --git a/src/net/cgo_stub.go b/src/net/cgo_stub.go
index 039e4be88b9..cc84ca47aed 100644
--- a/src/net/cgo_stub.go
+++ b/src/net/cgo_stub.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !cgo || netgo
-// +build !cgo netgo
package net
diff --git a/src/net/cgo_unix.go b/src/net/cgo_unix.go
index 5bf6fd84bc2..6fc2c1930e8 100644
--- a/src/net/cgo_unix.go
+++ b/src/net/cgo_unix.go
@@ -3,9 +3,6 @@
// license that can be found in the LICENSE file.
//go:build cgo && !netgo && (aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris)
-// +build cgo
-// +build !netgo
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package net
diff --git a/src/net/cgo_unix_test.go b/src/net/cgo_unix_test.go
index 1f3d9ea207a..b4da25b84c1 100644
--- a/src/net/cgo_unix_test.go
+++ b/src/net/cgo_unix_test.go
@@ -3,9 +3,6 @@
// license that can be found in the LICENSE file.
//go:build cgo && !netgo && (aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris)
-// +build cgo
-// +build !netgo
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package net
diff --git a/src/net/cgo_windows.go b/src/net/cgo_windows.go
index 1fd1f29787c..6bb6cbbb2fd 100644
--- a/src/net/cgo_windows.go
+++ b/src/net/cgo_windows.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build cgo && !netgo
-// +build cgo,!netgo
package net
diff --git a/src/net/conf.go b/src/net/conf.go
index 6b9569cd92f..1115699ab0f 100644
--- a/src/net/conf.go
+++ b/src/net/conf.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package net
diff --git a/src/net/conf_netcgo.go b/src/net/conf_netcgo.go
index 8f387ebc03e..82d1bb643e1 100644
--- a/src/net/conf_netcgo.go
+++ b/src/net/conf_netcgo.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build netcgo
-// +build netcgo
package net
diff --git a/src/net/conf_test.go b/src/net/conf_test.go
index b1f2c55ea50..5ae70550860 100644
--- a/src/net/conf_test.go
+++ b/src/net/conf_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
package net
diff --git a/src/net/conn_test.go b/src/net/conn_test.go
index 45e271c2642..e3cb0c5ec7e 100644
--- a/src/net/conn_test.go
+++ b/src/net/conn_test.go
@@ -6,7 +6,6 @@
// tag.
//go:build !js
-// +build !js
package net
diff --git a/src/net/dial_test.go b/src/net/dial_test.go
index 723038c7a22..89678921970 100644
--- a/src/net/dial_test.go
+++ b/src/net/dial_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
package net
diff --git a/src/net/dial_unix_test.go b/src/net/dial_unix_test.go
index 108b9730997..1113aaca905 100644
--- a/src/net/dial_unix_test.go
+++ b/src/net/dial_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package net
diff --git a/src/net/dnsclient_unix.go b/src/net/dnsclient_unix.go
index 50e9bb0f20d..21aa91f665a 100644
--- a/src/net/dnsclient_unix.go
+++ b/src/net/dnsclient_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
// DNS client: see RFC 1035.
// Has to be linked into package net for Dial.
diff --git a/src/net/dnsclient_unix_test.go b/src/net/dnsclient_unix_test.go
index 350ad5def79..1d704d021e2 100644
--- a/src/net/dnsclient_unix_test.go
+++ b/src/net/dnsclient_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package net
diff --git a/src/net/dnsconfig_unix.go b/src/net/dnsconfig_unix.go
index db9213a13fd..5ad254cd7c9 100644
--- a/src/net/dnsconfig_unix.go
+++ b/src/net/dnsconfig_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
// Read system DNS config from /etc/resolv.conf
diff --git a/src/net/dnsconfig_unix_test.go b/src/net/dnsconfig_unix_test.go
index 0e2317c4691..4d352214976 100644
--- a/src/net/dnsconfig_unix_test.go
+++ b/src/net/dnsconfig_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package net
diff --git a/src/net/dnsname_test.go b/src/net/dnsname_test.go
index d851bf75667..28b7c680feb 100644
--- a/src/net/dnsname_test.go
+++ b/src/net/dnsname_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
package net
diff --git a/src/net/error_posix.go b/src/net/error_posix.go
index 50eb66fc617..10e3caa67b7 100644
--- a/src/net/error_posix.go
+++ b/src/net/error_posix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris || windows
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris windows
package net
diff --git a/src/net/error_posix_test.go b/src/net/error_posix_test.go
index ea52a45ee89..081176f771a 100644
--- a/src/net/error_posix_test.go
+++ b/src/net/error_posix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !plan9
-// +build !plan9
package net
diff --git a/src/net/error_test.go b/src/net/error_test.go
index c304390819a..30f8af3aeea 100644
--- a/src/net/error_test.go
+++ b/src/net/error_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
package net
diff --git a/src/net/error_unix.go b/src/net/error_unix.go
index d0b5e2ce969..0e64b40ea1c 100644
--- a/src/net/error_unix.go
+++ b/src/net/error_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || js || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js linux netbsd openbsd solaris
package net
diff --git a/src/net/error_unix_test.go b/src/net/error_unix_test.go
index 533a45e648f..1334aa86b68 100644
--- a/src/net/error_unix_test.go
+++ b/src/net/error_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !plan9 && !windows
-// +build !plan9,!windows
package net
diff --git a/src/net/external_test.go b/src/net/external_test.go
index b8753cc092b..3a97011fe85 100644
--- a/src/net/external_test.go
+++ b/src/net/external_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
package net
diff --git a/src/net/fcntl_libc_test.go b/src/net/fcntl_libc_test.go
index 0320d63a863..3478ce72318 100644
--- a/src/net/fcntl_libc_test.go
+++ b/src/net/fcntl_libc_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || solaris
-// +build aix darwin solaris
package net
diff --git a/src/net/fcntl_syscall_test.go b/src/net/fcntl_syscall_test.go
index 0f04bb4ed65..2d1f7e22a45 100644
--- a/src/net/fcntl_syscall_test.go
+++ b/src/net/fcntl_syscall_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd || linux || netbsd || openbsd
-// +build dragonfly freebsd linux netbsd openbsd
package net
diff --git a/src/net/fd_posix.go b/src/net/fd_posix.go
index 38e5a8d61d1..1887a451867 100644
--- a/src/net/fd_posix.go
+++ b/src/net/fd_posix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || windows
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows
package net
diff --git a/src/net/fd_unix.go b/src/net/fd_unix.go
index a7bbdd26b45..1bb029d370c 100644
--- a/src/net/fd_unix.go
+++ b/src/net/fd_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package net
diff --git a/src/net/file_stub.go b/src/net/file_stub.go
index 9f988fe8993..91df926a578 100644
--- a/src/net/file_stub.go
+++ b/src/net/file_stub.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js && wasm
-// +build js,wasm
package net
diff --git a/src/net/file_test.go b/src/net/file_test.go
index a70ef1b312f..e86c15fac73 100644
--- a/src/net/file_test.go
+++ b/src/net/file_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
package net
diff --git a/src/net/file_unix.go b/src/net/file_unix.go
index 4520d4b839e..68d7eb9ca01 100644
--- a/src/net/file_unix.go
+++ b/src/net/file_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package net
diff --git a/src/net/hook_unix.go b/src/net/hook_unix.go
index b9153d1947f..7c36b0d6e32 100644
--- a/src/net/hook_unix.go
+++ b/src/net/hook_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris
package net
diff --git a/src/net/http/cgi/plan9_test.go b/src/net/http/cgi/plan9_test.go
index f998bac6ea6..b7ace3f81c9 100644
--- a/src/net/http/cgi/plan9_test.go
+++ b/src/net/http/cgi/plan9_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build plan9
-// +build plan9
package cgi
diff --git a/src/net/http/cgi/posix_test.go b/src/net/http/cgi/posix_test.go
index bc58ea94cc9..49b9470d4ae 100644
--- a/src/net/http/cgi/posix_test.go
+++ b/src/net/http/cgi/posix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !plan9
-// +build !plan9
package cgi
diff --git a/src/net/http/h2_bundle.go b/src/net/http/h2_bundle.go
index 29226d4065e..df98232824e 100644
--- a/src/net/http/h2_bundle.go
+++ b/src/net/http/h2_bundle.go
@@ -1,5 +1,4 @@
//go:build !nethttpomithttp2
-// +build !nethttpomithttp2
// Code generated by golang.org/x/tools/cmd/bundle. DO NOT EDIT.
// $ bundle -o=h2_bundle.go -prefix=http2 -tags=!nethttpomithttp2 golang.org/x/net/http2
diff --git a/src/net/http/omithttp2.go b/src/net/http/omithttp2.go
index 79599d006aa..63c0e92d6a6 100644
--- a/src/net/http/omithttp2.go
+++ b/src/net/http/omithttp2.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build nethttpomithttp2
-// +build nethttpomithttp2
package http
diff --git a/src/net/http/roundtrip.go b/src/net/http/roundtrip.go
index eef7c79293e..c4c5d3b6ebb 100644
--- a/src/net/http/roundtrip.go
+++ b/src/net/http/roundtrip.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js || !wasm
-// +build !js !wasm
package http
diff --git a/src/net/http/roundtrip_js.go b/src/net/http/roundtrip_js.go
index 4a8595ebcff..dd042e9a01c 100644
--- a/src/net/http/roundtrip_js.go
+++ b/src/net/http/roundtrip_js.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js && wasm
-// +build js,wasm
package http
diff --git a/src/net/http/triv.go b/src/net/http/triv.go
index 4dc62407c6d..11b19ab30c5 100644
--- a/src/net/http/triv.go
+++ b/src/net/http/triv.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
package main
diff --git a/src/net/interface_bsd.go b/src/net/interface_bsd.go
index 7578b1a16a9..db7bc756d8c 100644
--- a/src/net/interface_bsd.go
+++ b/src/net/interface_bsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || netbsd || openbsd
-// +build darwin dragonfly freebsd netbsd openbsd
package net
diff --git a/src/net/interface_bsd_test.go b/src/net/interface_bsd_test.go
index 8d0d9c36719..ce59962f610 100644
--- a/src/net/interface_bsd_test.go
+++ b/src/net/interface_bsd_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || netbsd || openbsd
-// +build darwin dragonfly freebsd netbsd openbsd
package net
diff --git a/src/net/interface_bsdvar.go b/src/net/interface_bsdvar.go
index 6230e0bfeec..e9bea3d3798 100644
--- a/src/net/interface_bsdvar.go
+++ b/src/net/interface_bsdvar.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || netbsd || openbsd
-// +build dragonfly netbsd openbsd
package net
diff --git a/src/net/interface_stub.go b/src/net/interface_stub.go
index efe67c24d3c..2d4475f63ee 100644
--- a/src/net/interface_stub.go
+++ b/src/net/interface_stub.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js && wasm
-// +build js,wasm
package net
diff --git a/src/net/interface_test.go b/src/net/interface_test.go
index 754db36e3c4..f6c98684181 100644
--- a/src/net/interface_test.go
+++ b/src/net/interface_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
package net
diff --git a/src/net/interface_unix_test.go b/src/net/interface_unix_test.go
index 0d69fa5da41..92ec13a909c 100644
--- a/src/net/interface_unix_test.go
+++ b/src/net/interface_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd
-// +build darwin dragonfly freebsd linux netbsd openbsd
package net
diff --git a/src/net/internal/socktest/main_test.go b/src/net/internal/socktest/main_test.go
index 8af85d382eb..c7c8d16d4c9 100644
--- a/src/net/internal/socktest/main_test.go
+++ b/src/net/internal/socktest/main_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js && !plan9
-// +build !js,!plan9
package socktest_test
diff --git a/src/net/internal/socktest/main_unix_test.go b/src/net/internal/socktest/main_unix_test.go
index 6aa8875b66c..7d21f6f99f6 100644
--- a/src/net/internal/socktest/main_unix_test.go
+++ b/src/net/internal/socktest/main_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js && !plan9 && !windows
-// +build !js,!plan9,!windows
package socktest_test
diff --git a/src/net/internal/socktest/switch_posix.go b/src/net/internal/socktest/switch_posix.go
index cda74e86399..fcad4ceae31 100644
--- a/src/net/internal/socktest/switch_posix.go
+++ b/src/net/internal/socktest/switch_posix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !plan9
-// +build !plan9
package socktest
diff --git a/src/net/internal/socktest/switch_stub.go b/src/net/internal/socktest/switch_stub.go
index 5aa2ecec08f..8a2fc353f05 100644
--- a/src/net/internal/socktest/switch_stub.go
+++ b/src/net/internal/socktest/switch_stub.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build plan9
-// +build plan9
package socktest
diff --git a/src/net/internal/socktest/switch_unix.go b/src/net/internal/socktest/switch_unix.go
index bfe9d4dbd36..77d68f61120 100644
--- a/src/net/internal/socktest/switch_unix.go
+++ b/src/net/internal/socktest/switch_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris
package socktest
diff --git a/src/net/internal/socktest/sys_cloexec.go b/src/net/internal/socktest/sys_cloexec.go
index c7f8331c2e5..cc7cefbe2c5 100644
--- a/src/net/internal/socktest/sys_cloexec.go
+++ b/src/net/internal/socktest/sys_cloexec.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd || illumos || linux || netbsd || openbsd
-// +build dragonfly freebsd illumos linux netbsd openbsd
package socktest
diff --git a/src/net/internal/socktest/sys_unix.go b/src/net/internal/socktest/sys_unix.go
index e7cc45922e0..0424164ed30 100644
--- a/src/net/internal/socktest/sys_unix.go
+++ b/src/net/internal/socktest/sys_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris
package socktest
diff --git a/src/net/ip_test.go b/src/net/ip_test.go
index 5bbda6024dc..10e77f3bdb4 100644
--- a/src/net/ip_test.go
+++ b/src/net/ip_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
package net
diff --git a/src/net/iprawsock_posix.go b/src/net/iprawsock_posix.go
index b94eec0e182..74f977e1efe 100644
--- a/src/net/iprawsock_posix.go
+++ b/src/net/iprawsock_posix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris || windows
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris windows
package net
diff --git a/src/net/iprawsock_test.go b/src/net/iprawsock_test.go
index a96448ee6c6..ca5ab480c0e 100644
--- a/src/net/iprawsock_test.go
+++ b/src/net/iprawsock_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
package net
diff --git a/src/net/ipsock_posix.go b/src/net/ipsock_posix.go
index 50003ac4464..0910f63d488 100644
--- a/src/net/ipsock_posix.go
+++ b/src/net/ipsock_posix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris || windows
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris windows
package net
diff --git a/src/net/listen_test.go b/src/net/listen_test.go
index 50355de1ac0..7aaebe8fa19 100644
--- a/src/net/listen_test.go
+++ b/src/net/listen_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js && !plan9
-// +build !js,!plan9
package net
diff --git a/src/net/lookup_fake.go b/src/net/lookup_fake.go
index f4fcaed5cfa..c27eae4ba50 100644
--- a/src/net/lookup_fake.go
+++ b/src/net/lookup_fake.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js && wasm
-// +build js,wasm
package net
diff --git a/src/net/lookup_test.go b/src/net/lookup_test.go
index 7ca6ac16ec6..7bcc5c5be83 100644
--- a/src/net/lookup_test.go
+++ b/src/net/lookup_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
package net
diff --git a/src/net/lookup_unix.go b/src/net/lookup_unix.go
index 8030e3d99e1..255a19dfdb4 100644
--- a/src/net/lookup_unix.go
+++ b/src/net/lookup_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package net
diff --git a/src/net/main_cloexec_test.go b/src/net/main_cloexec_test.go
index 742be2fcd81..ca7fc784913 100644
--- a/src/net/main_cloexec_test.go
+++ b/src/net/main_cloexec_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd || illumos || linux || netbsd || openbsd
-// +build dragonfly freebsd illumos linux netbsd openbsd
package net
diff --git a/src/net/main_conf_test.go b/src/net/main_conf_test.go
index 645b267b780..41b78eda1d8 100644
--- a/src/net/main_conf_test.go
+++ b/src/net/main_conf_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js && !plan9 && !windows
-// +build !js,!plan9,!windows
package net
diff --git a/src/net/main_noconf_test.go b/src/net/main_noconf_test.go
index bcea630cd3c..ab050fac2b4 100644
--- a/src/net/main_noconf_test.go
+++ b/src/net/main_noconf_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (js && wasm) || plan9 || windows
-// +build js,wasm plan9 windows
package net
diff --git a/src/net/main_posix_test.go b/src/net/main_posix_test.go
index c804c4e7556..8899aa9c94e 100644
--- a/src/net/main_posix_test.go
+++ b/src/net/main_posix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js && !plan9
-// +build !js,!plan9
package net
diff --git a/src/net/main_test.go b/src/net/main_test.go
index 4f004071f09..1ee8c2efe71 100644
--- a/src/net/main_test.go
+++ b/src/net/main_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
package net
diff --git a/src/net/main_unix_test.go b/src/net/main_unix_test.go
index c8cff2d305a..2ed0615ad86 100644
--- a/src/net/main_unix_test.go
+++ b/src/net/main_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package net
diff --git a/src/net/mockserver_test.go b/src/net/mockserver_test.go
index b50a1e59a1a..43b11a72189 100644
--- a/src/net/mockserver_test.go
+++ b/src/net/mockserver_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
package net
diff --git a/src/net/net_fake.go b/src/net/net_fake.go
index 48419be6703..d58bd820298 100644
--- a/src/net/net_fake.go
+++ b/src/net/net_fake.go
@@ -5,7 +5,6 @@
// Fake networking for js/wasm. It is intended to allow tests of other package to pass.
//go:build js && wasm
-// +build js,wasm
package net
diff --git a/src/net/net_test.go b/src/net/net_test.go
index 6e7be4db23c..35acac509be 100644
--- a/src/net/net_test.go
+++ b/src/net/net_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
package net
diff --git a/src/net/netgo_unix_test.go b/src/net/netgo_unix_test.go
index 5551e47de7f..019772aa6aa 100644
--- a/src/net/netgo_unix_test.go
+++ b/src/net/netgo_unix_test.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (!cgo || netgo) && (darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris)
-// +build !cgo netgo
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
package net
diff --git a/src/net/nss.go b/src/net/nss.go
index 85177cab9b9..ee5568883f2 100644
--- a/src/net/nss.go
+++ b/src/net/nss.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package net
diff --git a/src/net/nss_test.go b/src/net/nss_test.go
index 4b73886c511..c9ccc60cb78 100644
--- a/src/net/nss_test.go
+++ b/src/net/nss_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
package net
diff --git a/src/net/packetconn_test.go b/src/net/packetconn_test.go
index aeb9845fa77..b3b17156555 100644
--- a/src/net/packetconn_test.go
+++ b/src/net/packetconn_test.go
@@ -6,7 +6,6 @@
// tag.
//go:build !js
-// +build !js
package net
diff --git a/src/net/port_unix.go b/src/net/port_unix.go
index a9a96a2323b..102722b2ca7 100644
--- a/src/net/port_unix.go
+++ b/src/net/port_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris
// Read system port mappings from /etc/services
diff --git a/src/net/protoconn_test.go b/src/net/protoconn_test.go
index fc9b3862563..9f7d8ee4ef5 100644
--- a/src/net/protoconn_test.go
+++ b/src/net/protoconn_test.go
@@ -6,7 +6,6 @@
// tag.
//go:build !js
-// +build !js
package net
diff --git a/src/net/rawconn_stub_test.go b/src/net/rawconn_stub_test.go
index 975aa8d9569..ff3d829893d 100644
--- a/src/net/rawconn_stub_test.go
+++ b/src/net/rawconn_stub_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (js && wasm) || plan9
-// +build js,wasm plan9
package net
diff --git a/src/net/rawconn_test.go b/src/net/rawconn_test.go
index 3ef7af33b73..645d82a1a6a 100644
--- a/src/net/rawconn_test.go
+++ b/src/net/rawconn_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
package net
diff --git a/src/net/rawconn_unix_test.go b/src/net/rawconn_unix_test.go
index 75bbab8b27e..e6e1ad771a5 100644
--- a/src/net/rawconn_unix_test.go
+++ b/src/net/rawconn_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package net
diff --git a/src/net/sendfile_stub.go b/src/net/sendfile_stub.go
index c079064262d..4ddae852e17 100644
--- a/src/net/sendfile_stub.go
+++ b/src/net/sendfile_stub.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || (js && wasm) || netbsd || openbsd
-// +build aix js,wasm netbsd openbsd
package net
diff --git a/src/net/sendfile_test.go b/src/net/sendfile_test.go
index 54e51fa0abc..492333d0c85 100644
--- a/src/net/sendfile_test.go
+++ b/src/net/sendfile_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
package net
diff --git a/src/net/sendfile_unix_alt.go b/src/net/sendfile_unix_alt.go
index cd63dcc32ce..8845a981f58 100644
--- a/src/net/sendfile_unix_alt.go
+++ b/src/net/sendfile_unix_alt.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || solaris
-// +build darwin dragonfly freebsd solaris
package net
diff --git a/src/net/server_test.go b/src/net/server_test.go
index 7cbf1522988..5192c1e0afc 100644
--- a/src/net/server_test.go
+++ b/src/net/server_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
package net
diff --git a/src/net/sock_bsd.go b/src/net/sock_bsd.go
index 4c883ada78f..27daf722b53 100644
--- a/src/net/sock_bsd.go
+++ b/src/net/sock_bsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || netbsd || openbsd
-// +build darwin dragonfly freebsd netbsd openbsd
package net
diff --git a/src/net/sock_cloexec.go b/src/net/sock_cloexec.go
index 6861c4bf635..56dab31b146 100644
--- a/src/net/sock_cloexec.go
+++ b/src/net/sock_cloexec.go
@@ -6,7 +6,6 @@
// setting SetNonblock and CloseOnExec.
//go:build dragonfly || freebsd || illumos || linux || netbsd || openbsd
-// +build dragonfly freebsd illumos linux netbsd openbsd
package net
diff --git a/src/net/sock_posix.go b/src/net/sock_posix.go
index 9b1e7880aed..98a48229c75 100644
--- a/src/net/sock_posix.go
+++ b/src/net/sock_posix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || windows
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows
package net
diff --git a/src/net/sock_stub.go b/src/net/sock_stub.go
index d804bfaacce..4b73e575fe3 100644
--- a/src/net/sock_stub.go
+++ b/src/net/sock_stub.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || (js && wasm) || solaris
-// +build aix js,wasm solaris
package net
diff --git a/src/net/sockaddr_posix.go b/src/net/sockaddr_posix.go
index 9d77cb569b9..c8e91936ade 100644
--- a/src/net/sockaddr_posix.go
+++ b/src/net/sockaddr_posix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris || windows
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris windows
package net
diff --git a/src/net/sockopt_bsd.go b/src/net/sockopt_bsd.go
index ee1f98b834c..ff998119808 100644
--- a/src/net/sockopt_bsd.go
+++ b/src/net/sockopt_bsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || netbsd || openbsd
-// +build darwin dragonfly freebsd netbsd openbsd
package net
diff --git a/src/net/sockopt_posix.go b/src/net/sockopt_posix.go
index 50b9bfa0a78..645080f9885 100644
--- a/src/net/sockopt_posix.go
+++ b/src/net/sockopt_posix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || windows
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows
package net
diff --git a/src/net/sockopt_stub.go b/src/net/sockopt_stub.go
index 99b5277ed0a..98e23714d9a 100644
--- a/src/net/sockopt_stub.go
+++ b/src/net/sockopt_stub.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js && wasm
-// +build js,wasm
package net
diff --git a/src/net/sockoptip_bsdvar.go b/src/net/sockoptip_bsdvar.go
index 56022fd1a59..3e9ba1ee786 100644
--- a/src/net/sockoptip_bsdvar.go
+++ b/src/net/sockoptip_bsdvar.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd netbsd openbsd solaris
package net
diff --git a/src/net/sockoptip_posix.go b/src/net/sockoptip_posix.go
index a2143aec2cb..22031df22c2 100644
--- a/src/net/sockoptip_posix.go
+++ b/src/net/sockoptip_posix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || windows
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows
package net
diff --git a/src/net/sockoptip_stub.go b/src/net/sockoptip_stub.go
index 92349d88ba7..2c993eb7195 100644
--- a/src/net/sockoptip_stub.go
+++ b/src/net/sockoptip_stub.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js && wasm
-// +build js,wasm
package net
diff --git a/src/net/splice_stub.go b/src/net/splice_stub.go
index ce2e9046a94..3cdadb11c56 100644
--- a/src/net/splice_stub.go
+++ b/src/net/splice_stub.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !linux
-// +build !linux
package net
diff --git a/src/net/splice_test.go b/src/net/splice_test.go
index be13cc924d0..43e0b926f7a 100644
--- a/src/net/splice_test.go
+++ b/src/net/splice_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux
-// +build linux
package net
diff --git a/src/net/sys_cloexec.go b/src/net/sys_cloexec.go
index a32483e2df9..26eac5585a8 100644
--- a/src/net/sys_cloexec.go
+++ b/src/net/sys_cloexec.go
@@ -6,7 +6,6 @@
// for setting SetNonblock and CloseOnExec.
//go:build aix || darwin || (solaris && !illumos)
-// +build aix darwin solaris,!illumos
package net
diff --git a/src/net/tcpsock_posix.go b/src/net/tcpsock_posix.go
index 7c4523c5eea..ed6b18b5517 100644
--- a/src/net/tcpsock_posix.go
+++ b/src/net/tcpsock_posix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris || windows
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris windows
package net
diff --git a/src/net/tcpsock_test.go b/src/net/tcpsock_test.go
index 9c9f1eae93d..fdf5c330a99 100644
--- a/src/net/tcpsock_test.go
+++ b/src/net/tcpsock_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
package net
diff --git a/src/net/tcpsock_unix_test.go b/src/net/tcpsock_unix_test.go
index 41bd229132d..b1f2876d4ed 100644
--- a/src/net/tcpsock_unix_test.go
+++ b/src/net/tcpsock_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js && !plan9 && !windows
-// +build !js,!plan9,!windows
package net
diff --git a/src/net/tcpsockopt_posix.go b/src/net/tcpsockopt_posix.go
index d08832adc04..73754b1a0f7 100644
--- a/src/net/tcpsockopt_posix.go
+++ b/src/net/tcpsockopt_posix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || windows
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows
package net
diff --git a/src/net/tcpsockopt_stub.go b/src/net/tcpsockopt_stub.go
index 028d5fd29cf..0fe91829c0e 100644
--- a/src/net/tcpsockopt_stub.go
+++ b/src/net/tcpsockopt_stub.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js && wasm
-// +build js,wasm
package net
diff --git a/src/net/tcpsockopt_unix.go b/src/net/tcpsockopt_unix.go
index a945889e00e..bdcdc402398 100644
--- a/src/net/tcpsockopt_unix.go
+++ b/src/net/tcpsockopt_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || freebsd || linux || netbsd
-// +build aix freebsd linux netbsd
package net
diff --git a/src/net/timeout_test.go b/src/net/timeout_test.go
index 6c8e9cf76ef..82069b347a5 100644
--- a/src/net/timeout_test.go
+++ b/src/net/timeout_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
package net
diff --git a/src/net/udpsock_posix.go b/src/net/udpsock_posix.go
index 3a333ca2438..c3f7ddb77eb 100644
--- a/src/net/udpsock_posix.go
+++ b/src/net/udpsock_posix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris || windows
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris windows
package net
diff --git a/src/net/udpsock_test.go b/src/net/udpsock_test.go
index 0e8c3511c36..0f8f4631009 100644
--- a/src/net/udpsock_test.go
+++ b/src/net/udpsock_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
package net
diff --git a/src/net/unixsock_posix.go b/src/net/unixsock_posix.go
index 99a89c827b8..1b69df53bfd 100644
--- a/src/net/unixsock_posix.go
+++ b/src/net/unixsock_posix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris || windows
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris windows
package net
diff --git a/src/net/unixsock_readmsg_cloexec.go b/src/net/unixsock_readmsg_cloexec.go
index 716484cc6ce..fa4fd7d9331 100644
--- a/src/net/unixsock_readmsg_cloexec.go
+++ b/src/net/unixsock_readmsg_cloexec.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || freebsd || solaris
-// +build aix darwin freebsd solaris
package net
diff --git a/src/net/unixsock_readmsg_cmsg_cloexec.go b/src/net/unixsock_readmsg_cmsg_cloexec.go
index bb851b89c05..6b0de875ad5 100644
--- a/src/net/unixsock_readmsg_cmsg_cloexec.go
+++ b/src/net/unixsock_readmsg_cmsg_cloexec.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || linux || netbsd || openbsd
-// +build dragonfly linux netbsd openbsd
package net
diff --git a/src/net/unixsock_readmsg_other.go b/src/net/unixsock_readmsg_other.go
index 329076183ae..b3d19fe73dd 100644
--- a/src/net/unixsock_readmsg_other.go
+++ b/src/net/unixsock_readmsg_other.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (js && wasm) || windows
-// +build js,wasm windows
package net
diff --git a/src/net/unixsock_readmsg_test.go b/src/net/unixsock_readmsg_test.go
index a4d2fca69ce..c3bfbf9af2f 100644
--- a/src/net/unixsock_readmsg_test.go
+++ b/src/net/unixsock_readmsg_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package net
diff --git a/src/net/unixsock_test.go b/src/net/unixsock_test.go
index 71092e88fb6..a75578235f8 100644
--- a/src/net/unixsock_test.go
+++ b/src/net/unixsock_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js && !plan9 && !windows
-// +build !js,!plan9,!windows
package net
diff --git a/src/net/unixsock_windows_test.go b/src/net/unixsock_windows_test.go
index 29244f64710..dedd761c567 100644
--- a/src/net/unixsock_windows_test.go
+++ b/src/net/unixsock_windows_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build windows
-// +build windows
package net
diff --git a/src/net/write_unix_test.go b/src/net/write_unix_test.go
index f79f2d0865d..23e8befa92d 100644
--- a/src/net/write_unix_test.go
+++ b/src/net/write_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
package net
diff --git a/src/net/writev_test.go b/src/net/writev_test.go
index bf40ca2023a..b7522958620 100644
--- a/src/net/writev_test.go
+++ b/src/net/writev_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
package net
diff --git a/src/net/writev_unix.go b/src/net/writev_unix.go
index a0fedc2f990..51ab29dc312 100644
--- a/src/net/writev_unix.go
+++ b/src/net/writev_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || illumos || linux || netbsd || openbsd
-// +build darwin dragonfly freebsd illumos linux netbsd openbsd
package net
diff --git a/src/os/dir_unix.go b/src/os/dir_unix.go
index 5589c9c6825..4eeb9ab86ca 100644
--- a/src/os/dir_unix.go
+++ b/src/os/dir_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris
-// +build aix dragonfly freebsd js,wasm linux netbsd openbsd solaris
package os
diff --git a/src/os/endian_big.go b/src/os/endian_big.go
index 0529dccd6f2..0375e533726 100644
--- a/src/os/endian_big.go
+++ b/src/os/endian_big.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//
//go:build ppc64 || s390x || mips || mips64
-// +build ppc64 s390x mips mips64
package os
diff --git a/src/os/endian_little.go b/src/os/endian_little.go
index 6be6020f534..10643a804e0 100644
--- a/src/os/endian_little.go
+++ b/src/os/endian_little.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//
//go:build 386 || amd64 || arm || arm64 || ppc64le || mips64le || mipsle || riscv64 || wasm
-// +build 386 amd64 arm arm64 ppc64le mips64le mipsle riscv64 wasm
package os
diff --git a/src/os/env_unix_test.go b/src/os/env_unix_test.go
index d45e1deb833..75225d85476 100644
--- a/src/os/env_unix_test.go
+++ b/src/os/env_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package os_test
diff --git a/src/os/error_errno.go b/src/os/error_errno.go
index 580e915b73c..c8140461a4d 100644
--- a/src/os/error_errno.go
+++ b/src/os/error_errno.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !plan9
-// +build !plan9
package os
diff --git a/src/os/error_posix.go b/src/os/error_posix.go
index 268b3a923ab..234f4eb6921 100644
--- a/src/os/error_posix.go
+++ b/src/os/error_posix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris || windows
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris windows
package os
diff --git a/src/os/error_unix_test.go b/src/os/error_unix_test.go
index e45282a0fdb..81bccebedbb 100644
--- a/src/os/error_unix_test.go
+++ b/src/os/error_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris
package os_test
diff --git a/src/os/error_windows_test.go b/src/os/error_windows_test.go
index aa0c14b7d46..86c8a985bb3 100644
--- a/src/os/error_windows_test.go
+++ b/src/os/error_windows_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build windows
-// +build windows
package os_test
diff --git a/src/os/exec/exec_linux_test.go b/src/os/exec/exec_linux_test.go
index 3cfa30ee724..4a37c96e63a 100644
--- a/src/os/exec/exec_linux_test.go
+++ b/src/os/exec/exec_linux_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux && cgo
-// +build linux,cgo
// On systems that use glibc, calling malloc can create a new arena,
// and creating a new arena can read /sys/devices/system/cpu/online.
diff --git a/src/os/exec/exec_posix_test.go b/src/os/exec/exec_posix_test.go
index 7b2c0c0c111..fd7fb42d36a 100644
--- a/src/os/exec/exec_posix_test.go
+++ b/src/os/exec/exec_posix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package exec_test
diff --git a/src/os/exec/exec_unix.go b/src/os/exec/exec_unix.go
index 467c069e1ca..c20f35276c6 100644
--- a/src/os/exec/exec_unix.go
+++ b/src/os/exec/exec_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !plan9 && !windows
-// +build !plan9,!windows
package exec
diff --git a/src/os/exec/exec_windows_test.go b/src/os/exec/exec_windows_test.go
index bd4dfb31da5..8e31e47190f 100644
--- a/src/os/exec/exec_windows_test.go
+++ b/src/os/exec/exec_windows_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build windows
-// +build windows
package exec_test
diff --git a/src/os/exec/lp_js.go b/src/os/exec/lp_js.go
index 4eac25fe6f4..54ddc4d5b48 100644
--- a/src/os/exec/lp_js.go
+++ b/src/os/exec/lp_js.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js && wasm
-// +build js,wasm
package exec
diff --git a/src/os/exec/lp_unix.go b/src/os/exec/lp_unix.go
index d1d246accf1..38b9fc7c27f 100644
--- a/src/os/exec/lp_unix.go
+++ b/src/os/exec/lp_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package exec
diff --git a/src/os/exec/lp_unix_test.go b/src/os/exec/lp_unix_test.go
index 9fded0eb0af..52e401e5801 100644
--- a/src/os/exec/lp_unix_test.go
+++ b/src/os/exec/lp_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package exec
diff --git a/src/os/exec/read3.go b/src/os/exec/read3.go
index a8c71831d88..8aae5735c49 100644
--- a/src/os/exec/read3.go
+++ b/src/os/exec/read3.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
// This is a test program that verifies that it can read from
// descriptor 3 and that no other descriptors are open.
diff --git a/src/os/exec_posix.go b/src/os/exec_posix.go
index e8736f7c54e..07e2b36f622 100644
--- a/src/os/exec_posix.go
+++ b/src/os/exec_posix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris || windows
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris windows
package os
diff --git a/src/os/exec_unix.go b/src/os/exec_unix.go
index d1bbeb75298..250c5c6402e 100644
--- a/src/os/exec_unix.go
+++ b/src/os/exec_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris
package os
diff --git a/src/os/exec_unix_test.go b/src/os/exec_unix_test.go
index f14b3519fbe..fa332bf1ed8 100644
--- a/src/os/exec_unix_test.go
+++ b/src/os/exec_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package os_test
diff --git a/src/os/executable_path.go b/src/os/executable_path.go
index 625430ecfca..d6161bcb08b 100644
--- a/src/os/executable_path.go
+++ b/src/os/executable_path.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || openbsd
-// +build aix openbsd
package os
diff --git a/src/os/executable_plan9.go b/src/os/executable_plan9.go
index ad7a4410dcd..8d8c83260f5 100644
--- a/src/os/executable_plan9.go
+++ b/src/os/executable_plan9.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build plan9
-// +build plan9
package os
diff --git a/src/os/executable_procfs.go b/src/os/executable_procfs.go
index 76ba0e6d085..18348eab912 100644
--- a/src/os/executable_procfs.go
+++ b/src/os/executable_procfs.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux || netbsd || (js && wasm)
-// +build linux netbsd js,wasm
package os
diff --git a/src/os/executable_sysctl.go b/src/os/executable_sysctl.go
index 039448b5573..3c2aeacf7da 100644
--- a/src/os/executable_sysctl.go
+++ b/src/os/executable_sysctl.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build freebsd || dragonfly
-// +build freebsd dragonfly
package os
diff --git a/src/os/export_unix_test.go b/src/os/export_unix_test.go
index 10f83128317..d4eb7a4fb14 100644
--- a/src/os/export_unix_test.go
+++ b/src/os/export_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris
package os
diff --git a/src/os/fifo_test.go b/src/os/fifo_test.go
index 007ed291293..de709279613 100644
--- a/src/os/fifo_test.go
+++ b/src/os/fifo_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd
-// +build darwin dragonfly freebsd linux netbsd openbsd
package os_test
diff --git a/src/os/file_posix.go b/src/os/file_posix.go
index 211f2a1798a..0dc6da09087 100644
--- a/src/os/file_posix.go
+++ b/src/os/file_posix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris || windows
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris windows
package os
diff --git a/src/os/file_unix.go b/src/os/file_unix.go
index a2531b96562..a38db189548 100644
--- a/src/os/file_unix.go
+++ b/src/os/file_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris
package os
diff --git a/src/os/os_unix_test.go b/src/os/os_unix_test.go
index 9b4c0ab290b..3ec3dee24ba 100644
--- a/src/os/os_unix_test.go
+++ b/src/os/os_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris
package os_test
diff --git a/src/os/path_unix.go b/src/os/path_unix.go
index db383594920..d1ffe2c1877 100644
--- a/src/os/path_unix.go
+++ b/src/os/path_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris
package os
diff --git a/src/os/pipe2_bsd.go b/src/os/pipe2_bsd.go
index bf6d081db5b..7eb1350d025 100644
--- a/src/os/pipe2_bsd.go
+++ b/src/os/pipe2_bsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd || netbsd || openbsd
-// +build dragonfly freebsd netbsd openbsd
package os
diff --git a/src/os/pipe2_illumos.go b/src/os/pipe2_illumos.go
index 71b8cb8e25b..354b35cc462 100644
--- a/src/os/pipe2_illumos.go
+++ b/src/os/pipe2_illumos.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build illumos
-// +build illumos
package os
diff --git a/src/os/pipe_bsd.go b/src/os/pipe_bsd.go
index 097b32e7eb3..554d62111a5 100644
--- a/src/os/pipe_bsd.go
+++ b/src/os/pipe_bsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || (js && wasm) || (solaris && !illumos)
-// +build aix darwin js,wasm solaris,!illumos
package os
diff --git a/src/os/pipe_test.go b/src/os/pipe_test.go
index 41a1e9c78aa..ab6d1ce2b61 100644
--- a/src/os/pipe_test.go
+++ b/src/os/pipe_test.go
@@ -4,7 +4,6 @@
// Test broken pipes on Unix systems.
//go:build !plan9 && !js
-// +build !plan9,!js
package os_test
diff --git a/src/os/rawconn.go b/src/os/rawconn.go
index ffc598b0618..14a495d9c0a 100644
--- a/src/os/rawconn.go
+++ b/src/os/rawconn.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !plan9
-// +build !plan9
package os
diff --git a/src/os/rawconn_test.go b/src/os/rawconn_test.go
index 8aebaf87a60..fd2038a2332 100644
--- a/src/os/rawconn_test.go
+++ b/src/os/rawconn_test.go
@@ -4,7 +4,6 @@
// Test use of raw connections.
//go:build !plan9 && !js
-// +build !plan9,!js
package os_test
diff --git a/src/os/readfrom_stub.go b/src/os/readfrom_stub.go
index 826760f3df6..8b7d5fb8f9e 100644
--- a/src/os/readfrom_stub.go
+++ b/src/os/readfrom_stub.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !linux
-// +build !linux
package os
diff --git a/src/os/removeall_at.go b/src/os/removeall_at.go
index d04540bc63e..da804c436f6 100644
--- a/src/os/removeall_at.go
+++ b/src/os/removeall_at.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package os
diff --git a/src/os/removeall_noat.go b/src/os/removeall_noat.go
index 853e0eddfc8..a0332e8c356 100644
--- a/src/os/removeall_noat.go
+++ b/src/os/removeall_noat.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris
-// +build !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris
package os
diff --git a/src/os/signal/example_unix_test.go b/src/os/signal/example_unix_test.go
index 3f7795b8cf9..b279ee9491f 100644
--- a/src/os/signal/example_unix_test.go
+++ b/src/os/signal/example_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package signal_test
diff --git a/src/os/signal/internal/pty/pty.go b/src/os/signal/internal/pty/pty.go
index 8d2eac71035..537febba553 100644
--- a/src/os/signal/internal/pty/pty.go
+++ b/src/os/signal/internal/pty/pty.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (aix || darwin || dragonfly || freebsd || (linux && !android) || netbsd || openbsd) && cgo
-// +build aix darwin dragonfly freebsd linux,!android netbsd openbsd
-// +build cgo
// Package pty is a simple pseudo-terminal package for Unix systems,
// implemented by calling C functions via cgo.
diff --git a/src/os/signal/signal_cgo_test.go b/src/os/signal/signal_cgo_test.go
index e1e4509e2a7..67bad66e0b2 100644
--- a/src/os/signal/signal_cgo_test.go
+++ b/src/os/signal/signal_cgo_test.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (darwin || dragonfly || freebsd || (linux && !android) || netbsd || openbsd) && cgo
-// +build darwin dragonfly freebsd linux,!android netbsd openbsd
-// +build cgo
// Note that this test does not work on Solaris: issue #22849.
// Don't run the test on Android because at least some versions of the
diff --git a/src/os/signal/signal_linux_test.go b/src/os/signal/signal_linux_test.go
index 7abe1ec5a0a..f70f108442b 100644
--- a/src/os/signal/signal_linux_test.go
+++ b/src/os/signal/signal_linux_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux
-// +build linux
package signal
diff --git a/src/os/signal/signal_test.go b/src/os/signal/signal_test.go
index 649854b746c..3e85d936f8a 100644
--- a/src/os/signal/signal_test.go
+++ b/src/os/signal/signal_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package signal
diff --git a/src/os/signal/signal_unix.go b/src/os/signal/signal_unix.go
index 9e241c43ace..e2e5c4ae970 100644
--- a/src/os/signal/signal_unix.go
+++ b/src/os/signal/signal_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris || windows
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris windows
package signal
diff --git a/src/os/stat_js.go b/src/os/stat_js.go
index 3badf5ba575..c3e9b5b5e53 100644
--- a/src/os/stat_js.go
+++ b/src/os/stat_js.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js && wasm
-// +build js,wasm
package os
diff --git a/src/os/stat_unix.go b/src/os/stat_unix.go
index 8c17805f71f..eb15db5453b 100644
--- a/src/os/stat_unix.go
+++ b/src/os/stat_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris
package os
diff --git a/src/os/sticky_bsd.go b/src/os/sticky_bsd.go
index ab23d8111d3..e71daf7c749 100644
--- a/src/os/sticky_bsd.go
+++ b/src/os/sticky_bsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js,wasm netbsd openbsd solaris
package os
diff --git a/src/os/sticky_notbsd.go b/src/os/sticky_notbsd.go
index 9979b43e8e6..9a87fbde92c 100644
--- a/src/os/sticky_notbsd.go
+++ b/src/os/sticky_notbsd.go
@@ -3,14 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !aix && !darwin && !dragonfly && !freebsd && (!js || !wasm) && !netbsd && !openbsd && !solaris
-// +build !aix
-// +build !darwin
-// +build !dragonfly
-// +build !freebsd
-// +build !js !wasm
-// +build !netbsd
-// +build !openbsd
-// +build !solaris
package os
diff --git a/src/os/sys_bsd.go b/src/os/sys_bsd.go
index 1e245eb53a2..e272c245717 100644
--- a/src/os/sys_bsd.go
+++ b/src/os/sys_bsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || (js && wasm) || netbsd || openbsd
-// +build darwin dragonfly freebsd js,wasm netbsd openbsd
package os
diff --git a/src/os/sys_js.go b/src/os/sys_js.go
index 4d6a64e8ebe..4fd0e2d7c7d 100644
--- a/src/os/sys_js.go
+++ b/src/os/sys_js.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js && wasm
-// +build js,wasm
package os
diff --git a/src/os/sys_unix.go b/src/os/sys_unix.go
index e316eaf06c4..5ff39780e5e 100644
--- a/src/os/sys_unix.go
+++ b/src/os/sys_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package os
diff --git a/src/os/timeout_test.go b/src/os/timeout_test.go
index 6d65e420f04..2ff58110d65 100644
--- a/src/os/timeout_test.go
+++ b/src/os/timeout_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js && !plan9 && !windows
-// +build !js,!plan9,!windows
package os_test
diff --git a/src/os/types_unix.go b/src/os/types_unix.go
index e9b8b8ba3ac..105bb78765a 100644
--- a/src/os/types_unix.go
+++ b/src/os/types_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !windows && !plan9
-// +build !windows,!plan9
package os
diff --git a/src/os/user/cgo_listgroups_unix.go b/src/os/user/cgo_listgroups_unix.go
index 38aa7653b05..0d937da3345 100644
--- a/src/os/user/cgo_listgroups_unix.go
+++ b/src/os/user/cgo_listgroups_unix.go
@@ -3,9 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (dragonfly || darwin || freebsd || (!android && linux) || netbsd || openbsd || (solaris && !illumos)) && cgo && !osusergo
-// +build dragonfly darwin freebsd !android,linux netbsd openbsd solaris,!illumos
-// +build cgo
-// +build !osusergo
package user
diff --git a/src/os/user/cgo_lookup_unix.go b/src/os/user/cgo_lookup_unix.go
index 5c972e77cfb..523269086e6 100644
--- a/src/os/user/cgo_lookup_unix.go
+++ b/src/os/user/cgo_lookup_unix.go
@@ -3,9 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (aix || darwin || dragonfly || freebsd || (!android && linux) || netbsd || openbsd || solaris) && cgo && !osusergo
-// +build aix darwin dragonfly freebsd !android,linux netbsd openbsd solaris
-// +build cgo
-// +build !osusergo
package user
diff --git a/src/os/user/cgo_unix_test.go b/src/os/user/cgo_unix_test.go
index 9ec32b3a788..6d16aa20b30 100644
--- a/src/os/user/cgo_unix_test.go
+++ b/src/os/user/cgo_unix_test.go
@@ -3,9 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (darwin || dragonfly || freebsd || (!android && linux) || netbsd || openbsd || solaris) && cgo && !osusergo
-// +build darwin dragonfly freebsd !android,linux netbsd openbsd solaris
-// +build cgo
-// +build !osusergo
package user
diff --git a/src/os/user/getgrouplist_darwin.go b/src/os/user/getgrouplist_darwin.go
index 23d12e32476..db6fb87e23f 100644
--- a/src/os/user/getgrouplist_darwin.go
+++ b/src/os/user/getgrouplist_darwin.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build cgo && !osusergo
-// +build cgo,!osusergo
package user
diff --git a/src/os/user/getgrouplist_unix.go b/src/os/user/getgrouplist_unix.go
index fd66961ccf7..104c2243df6 100644
--- a/src/os/user/getgrouplist_unix.go
+++ b/src/os/user/getgrouplist_unix.go
@@ -3,9 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (dragonfly || freebsd || (!android && linux) || netbsd || openbsd || (solaris && !illumos)) && cgo && !osusergo
-// +build dragonfly freebsd !android,linux netbsd openbsd solaris,!illumos
-// +build cgo
-// +build !osusergo
package user
diff --git a/src/os/user/listgroups_stub.go b/src/os/user/listgroups_stub.go
index a066c6db712..4cf808b65de 100644
--- a/src/os/user/listgroups_stub.go
+++ b/src/os/user/listgroups_stub.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build android || (js && !wasm)
-// +build android js,!wasm
package user
diff --git a/src/os/user/lookup_android.go b/src/os/user/lookup_android.go
index 151aab49c20..0ae31fd8189 100644
--- a/src/os/user/lookup_android.go
+++ b/src/os/user/lookup_android.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build android
-// +build android
package user
diff --git a/src/os/user/lookup_stubs.go b/src/os/user/lookup_stubs.go
index efaa92923d2..ce1617d2507 100644
--- a/src/os/user/lookup_stubs.go
+++ b/src/os/user/lookup_stubs.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (!cgo && !windows && !plan9) || android || (osusergo && !windows && !plan9)
-// +build !cgo,!windows,!plan9 android osusergo,!windows,!plan9
package user
diff --git a/src/os/user/lookup_unix.go b/src/os/user/lookup_unix.go
index 1cabdb5b711..e25323fbadb 100644
--- a/src/os/user/lookup_unix.go
+++ b/src/os/user/lookup_unix.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (aix || darwin || dragonfly || freebsd || (js && wasm) || (!android && linux) || netbsd || openbsd || solaris) && (!cgo || osusergo)
-// +build aix darwin dragonfly freebsd js,wasm !android,linux netbsd openbsd solaris
-// +build !cgo osusergo
package user
diff --git a/src/os/user/lookup_unix_test.go b/src/os/user/lookup_unix_test.go
index 05d23567c38..77917677fc1 100644
--- a/src/os/user/lookup_unix_test.go
+++ b/src/os/user/lookup_unix_test.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (aix || darwin || dragonfly || freebsd || (!android && linux) || netbsd || openbsd || solaris) && !cgo
-// +build aix darwin dragonfly freebsd !android,linux netbsd openbsd solaris
-// +build !cgo
package user
diff --git a/src/os/wait_unimp.go b/src/os/wait_unimp.go
index c1f66ca1554..721b9f9f7e3 100644
--- a/src/os/wait_unimp.go
+++ b/src/os/wait_unimp.go
@@ -7,7 +7,6 @@
// failures, see issue #48789.
//go:build aix || darwin || (js && wasm) || netbsd || openbsd || solaris
-// +build aix darwin js,wasm netbsd openbsd solaris
package os
diff --git a/src/os/wait_wait6.go b/src/os/wait_wait6.go
index 51193401f93..d395dac40b4 100644
--- a/src/os/wait_wait6.go
+++ b/src/os/wait_wait6.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd
-// +build dragonfly freebsd
package os
diff --git a/src/os/wait_waitid.go b/src/os/wait_waitid.go
index 44962c8534e..c0503b209c0 100644
--- a/src/os/wait_waitid.go
+++ b/src/os/wait_waitid.go
@@ -6,7 +6,6 @@
// waitid returns if the process is stopped, even when using WEXITED.
//go:build linux
-// +build linux
package os
diff --git a/src/path/filepath/example_unix_test.go b/src/path/filepath/example_unix_test.go
index 4ce10095e67..b364cf0608d 100644
--- a/src/path/filepath/example_unix_test.go
+++ b/src/path/filepath/example_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !windows && !plan9
-// +build !windows,!plan9
package filepath_test
diff --git a/src/path/filepath/example_unix_walk_test.go b/src/path/filepath/example_unix_walk_test.go
index d72efcebe61..86146dba5be 100644
--- a/src/path/filepath/example_unix_walk_test.go
+++ b/src/path/filepath/example_unix_walk_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !windows && !plan9
-// +build !windows,!plan9
package filepath_test
diff --git a/src/path/filepath/path_unix.go b/src/path/filepath/path_unix.go
index d4b6f967a3f..dcf1d187e7a 100644
--- a/src/path/filepath/path_unix.go
+++ b/src/path/filepath/path_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris
package filepath
diff --git a/src/path/filepath/symlink_unix.go b/src/path/filepath/symlink_unix.go
index 657945a81a3..7bfe17e2fd1 100644
--- a/src/path/filepath/symlink_unix.go
+++ b/src/path/filepath/symlink_unix.go
@@ -1,5 +1,4 @@
//go:build !windows
-// +build !windows
package filepath
diff --git a/src/plugin/plugin_dlopen.go b/src/plugin/plugin_dlopen.go
index aa85d4831ce..5fff329fc50 100644
--- a/src/plugin/plugin_dlopen.go
+++ b/src/plugin/plugin_dlopen.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (linux && cgo) || (darwin && cgo) || (freebsd && cgo)
-// +build linux,cgo darwin,cgo freebsd,cgo
package plugin
diff --git a/src/plugin/plugin_stubs.go b/src/plugin/plugin_stubs.go
index 67855bed4ba..2e9492e7c65 100644
--- a/src/plugin/plugin_stubs.go
+++ b/src/plugin/plugin_stubs.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (!linux && !freebsd && !darwin) || !cgo
-// +build !linux,!freebsd,!darwin !cgo
package plugin
diff --git a/src/plugin/plugin_test.go b/src/plugin/plugin_test.go
index 4ce912132c9..8185095f858 100644
--- a/src/plugin/plugin_test.go
+++ b/src/plugin/plugin_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !linux || (linux && !arm64)
-// +build !linux linux,!arm64
package plugin_test
diff --git a/src/reflect/abi_test.go b/src/reflect/abi_test.go
index 873febbad2d..41cfd9d0823 100644
--- a/src/reflect/abi_test.go
+++ b/src/reflect/abi_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build goexperiment.regabireflect && goexperiment.regabiargs
-// +build goexperiment.regabireflect,goexperiment.regabiargs
package reflect_test
diff --git a/src/reflect/float32reg_generic.go b/src/reflect/float32reg_generic.go
index bfceb9ecaa2..307c0bb33c1 100644
--- a/src/reflect/float32reg_generic.go
+++ b/src/reflect/float32reg_generic.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !ppc64 && !ppc64le
-// +build !ppc64,!ppc64le
package reflect
diff --git a/src/reflect/stubs_ppc64x.go b/src/reflect/stubs_ppc64x.go
index dbd3f9e7484..06c8bf5483b 100644
--- a/src/reflect/stubs_ppc64x.go
+++ b/src/reflect/stubs_ppc64x.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ppc64le || ppc64
-// +build ppc64le ppc64
package reflect
diff --git a/src/regexp/exec2_test.go b/src/regexp/exec2_test.go
index 6444bc12f90..b6dac4a058f 100644
--- a/src/regexp/exec2_test.go
+++ b/src/regexp/exec2_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !race
-// +build !race
package regexp
diff --git a/src/runtime/abi_test.go b/src/runtime/abi_test.go
index f69d3a9d501..5c1f1f40672 100644
--- a/src/runtime/abi_test.go
+++ b/src/runtime/abi_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build goexperiment.regabireflect
-// +build goexperiment.regabireflect
// This file contains tests specific to making sure the register ABI
// works in a bunch of contexts in the runtime.
diff --git a/src/runtime/asan.go b/src/runtime/asan.go
index 7ff5f26bfb8..a22b56bb079 100644
--- a/src/runtime/asan.go
+++ b/src/runtime/asan.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build asan
-// +build asan
package runtime
diff --git a/src/runtime/asan0.go b/src/runtime/asan0.go
index dad069bbe65..d5478d6bee8 100644
--- a/src/runtime/asan0.go
+++ b/src/runtime/asan0.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !asan
-// +build !asan
// Dummy ASan support API, used when not built with -asan.
diff --git a/src/runtime/auxv_none.go b/src/runtime/auxv_none.go
index 3178f1a154c..5d473cab5ca 100644
--- a/src/runtime/auxv_none.go
+++ b/src/runtime/auxv_none.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !linux && !darwin && !dragonfly && !freebsd && !netbsd && !solaris
-// +build !linux,!darwin,!dragonfly,!freebsd,!netbsd,!solaris
package runtime
diff --git a/src/runtime/cgo/callbacks_traceback.go b/src/runtime/cgo/callbacks_traceback.go
index 7302c1eedfa..dae31a8fcde 100644
--- a/src/runtime/cgo/callbacks_traceback.go
+++ b/src/runtime/cgo/callbacks_traceback.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || linux
-// +build darwin linux
package cgo
diff --git a/src/runtime/cgo/dragonfly.go b/src/runtime/cgo/dragonfly.go
index cfa6fe86e2f..36d70e34e2d 100644
--- a/src/runtime/cgo/dragonfly.go
+++ b/src/runtime/cgo/dragonfly.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly
-// +build dragonfly
package cgo
diff --git a/src/runtime/cgo/freebsd.go b/src/runtime/cgo/freebsd.go
index d56702ec704..2d9f6245b54 100644
--- a/src/runtime/cgo/freebsd.go
+++ b/src/runtime/cgo/freebsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build freebsd
-// +build freebsd
package cgo
diff --git a/src/runtime/cgo/linux.go b/src/runtime/cgo/linux.go
index 070d531beeb..1d6fe03917b 100644
--- a/src/runtime/cgo/linux.go
+++ b/src/runtime/cgo/linux.go
@@ -6,7 +6,6 @@
// corresponding cgo->libc (nptl) wrappers for various system calls.
//go:build linux
-// +build linux
package cgo
diff --git a/src/runtime/cgo/mmap.go b/src/runtime/cgo/mmap.go
index 347ae6b363f..eae0a9e7cc8 100644
--- a/src/runtime/cgo/mmap.go
+++ b/src/runtime/cgo/mmap.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (linux && amd64) || (linux && arm64)
-// +build linux,amd64 linux,arm64
package cgo
diff --git a/src/runtime/cgo/netbsd.go b/src/runtime/cgo/netbsd.go
index 7e17d1fcd25..8a8018b7a89 100644
--- a/src/runtime/cgo/netbsd.go
+++ b/src/runtime/cgo/netbsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build netbsd
-// +build netbsd
package cgo
diff --git a/src/runtime/cgo/openbsd.go b/src/runtime/cgo/openbsd.go
index f6215613c33..872d02e3345 100644
--- a/src/runtime/cgo/openbsd.go
+++ b/src/runtime/cgo/openbsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build openbsd
-// +build openbsd
package cgo
diff --git a/src/runtime/cgo/setenv.go b/src/runtime/cgo/setenv.go
index e6e8040ae08..0f4780a9458 100644
--- a/src/runtime/cgo/setenv.go
+++ b/src/runtime/cgo/setenv.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package cgo
diff --git a/src/runtime/cgo/sigaction.go b/src/runtime/cgo/sigaction.go
index 692fd2675f9..dc714f7ef4a 100644
--- a/src/runtime/cgo/sigaction.go
+++ b/src/runtime/cgo/sigaction.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (linux && amd64) || (freebsd && amd64) || (linux && arm64) || (linux && ppc64le)
-// +build linux,amd64 freebsd,amd64 linux,arm64 linux,ppc64le
package cgo
diff --git a/src/runtime/cgo_mmap.go b/src/runtime/cgo_mmap.go
index 17d26b4cc82..0cb25bdcdab 100644
--- a/src/runtime/cgo_mmap.go
+++ b/src/runtime/cgo_mmap.go
@@ -5,7 +5,6 @@
// Support for memory sanitizer. See runtime/cgo/mmap.go.
//go:build (linux && amd64) || (linux && arm64)
-// +build linux,amd64 linux,arm64
package runtime
diff --git a/src/runtime/cgo_ppc64x.go b/src/runtime/cgo_ppc64x.go
index 4dc92ea3211..97b962e40f6 100644
--- a/src/runtime/cgo_ppc64x.go
+++ b/src/runtime/cgo_ppc64x.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ppc64 || ppc64le
-// +build ppc64 ppc64le
package runtime
diff --git a/src/runtime/cgo_sigaction.go b/src/runtime/cgo_sigaction.go
index 6099d1b746f..7e8ae282756 100644
--- a/src/runtime/cgo_sigaction.go
+++ b/src/runtime/cgo_sigaction.go
@@ -5,7 +5,6 @@
// Support for sanitizers. See runtime/cgo/sigaction.go.
//go:build (linux && amd64) || (freebsd && amd64) || (linux && arm64) || (linux && ppc64le)
-// +build linux,amd64 freebsd,amd64 linux,arm64 linux,ppc64le
package runtime
diff --git a/src/runtime/cputicks.go b/src/runtime/cputicks.go
index 7c926f4a2b8..2cf32403333 100644
--- a/src/runtime/cputicks.go
+++ b/src/runtime/cputicks.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !arm && !arm64 && !mips64 && !mips64le && !mips && !mipsle && !wasm
-// +build !arm,!arm64,!mips64,!mips64le,!mips,!mipsle,!wasm
package runtime
diff --git a/src/runtime/crash_cgo_test.go b/src/runtime/crash_cgo_test.go
index c0d4569462c..e6d1742a384 100644
--- a/src/runtime/crash_cgo_test.go
+++ b/src/runtime/crash_cgo_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build cgo
-// +build cgo
package runtime_test
diff --git a/src/runtime/crash_nonunix_test.go b/src/runtime/crash_nonunix_test.go
index 5f61476f217..73c1cd3101f 100644
--- a/src/runtime/crash_nonunix_test.go
+++ b/src/runtime/crash_nonunix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build windows || plan9 || (js && wasm)
-// +build windows plan9 js,wasm
package runtime_test
diff --git a/src/runtime/crash_unix_test.go b/src/runtime/crash_unix_test.go
index 694cc3d138b..0d9d22aa49f 100644
--- a/src/runtime/crash_unix_test.go
+++ b/src/runtime/crash_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package runtime_test
diff --git a/src/runtime/debug/panic_test.go b/src/runtime/debug/panic_test.go
index 65f9555f376..ec5294ce4ce 100644
--- a/src/runtime/debug/panic_test.go
+++ b/src/runtime/debug/panic_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd
-// +build aix darwin dragonfly freebsd linux netbsd openbsd
// TODO: test on Windows?
diff --git a/src/runtime/debug_test.go b/src/runtime/debug_test.go
index f74383457f3..b5db7a55f1b 100644
--- a/src/runtime/debug_test.go
+++ b/src/runtime/debug_test.go
@@ -10,7 +10,6 @@
// point.
//go:build amd64 && linux && !race
-// +build amd64,linux,!race
package runtime_test
diff --git a/src/runtime/debugcall.go b/src/runtime/debugcall.go
index a1440f7649d..005a259f283 100644
--- a/src/runtime/debugcall.go
+++ b/src/runtime/debugcall.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64
-// +build amd64
package runtime
diff --git a/src/runtime/debuglog_off.go b/src/runtime/debuglog_off.go
index dd381569992..fa3be39c70f 100644
--- a/src/runtime/debuglog_off.go
+++ b/src/runtime/debuglog_off.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !debuglog
-// +build !debuglog
package runtime
diff --git a/src/runtime/debuglog_on.go b/src/runtime/debuglog_on.go
index 2fcdbe70d14..b8150202251 100644
--- a/src/runtime/debuglog_on.go
+++ b/src/runtime/debuglog_on.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build debuglog
-// +build debuglog
package runtime
diff --git a/src/runtime/defs1_linux.go b/src/runtime/defs1_linux.go
index df9c05dd5ed..709f19e5999 100644
--- a/src/runtime/defs1_linux.go
+++ b/src/runtime/defs1_linux.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
Input to cgo -cdefs
diff --git a/src/runtime/defs2_linux.go b/src/runtime/defs2_linux.go
index d016db7d027..41ad73576f1 100644
--- a/src/runtime/defs2_linux.go
+++ b/src/runtime/defs2_linux.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
* Input to cgo -cdefs
diff --git a/src/runtime/defs3_linux.go b/src/runtime/defs3_linux.go
index 0a06aa23707..99479aad061 100644
--- a/src/runtime/defs3_linux.go
+++ b/src/runtime/defs3_linux.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
Input to cgo -cdefs
diff --git a/src/runtime/defs_aix.go b/src/runtime/defs_aix.go
index 1605002ea20..b794cd5de8b 100644
--- a/src/runtime/defs_aix.go
+++ b/src/runtime/defs_aix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
Input to cgo -godefs
diff --git a/src/runtime/defs_aix_ppc64.go b/src/runtime/defs_aix_ppc64.go
index f84ff1160d0..4e20c858411 100644
--- a/src/runtime/defs_aix_ppc64.go
+++ b/src/runtime/defs_aix_ppc64.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix
-// +build aix
package runtime
diff --git a/src/runtime/defs_arm_linux.go b/src/runtime/defs_arm_linux.go
index f6b6dd2c09e..805735bd0ee 100644
--- a/src/runtime/defs_arm_linux.go
+++ b/src/runtime/defs_arm_linux.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
Input to cgo.
diff --git a/src/runtime/defs_darwin.go b/src/runtime/defs_darwin.go
index 2d41a97b574..59b81cf7136 100644
--- a/src/runtime/defs_darwin.go
+++ b/src/runtime/defs_darwin.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
Input to cgo.
diff --git a/src/runtime/defs_dragonfly.go b/src/runtime/defs_dragonfly.go
index aca2bf9001e..47a2e4d1232 100644
--- a/src/runtime/defs_dragonfly.go
+++ b/src/runtime/defs_dragonfly.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
Input to cgo.
diff --git a/src/runtime/defs_freebsd.go b/src/runtime/defs_freebsd.go
index c258759549c..9ba97c84596 100644
--- a/src/runtime/defs_freebsd.go
+++ b/src/runtime/defs_freebsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
Input to cgo.
diff --git a/src/runtime/defs_linux.go b/src/runtime/defs_linux.go
index 7c3167032f4..fa94e388f45 100644
--- a/src/runtime/defs_linux.go
+++ b/src/runtime/defs_linux.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
Input to cgo -cdefs
diff --git a/src/runtime/defs_linux_mips64x.go b/src/runtime/defs_linux_mips64x.go
index 1743bbce419..63433cb9be5 100644
--- a/src/runtime/defs_linux_mips64x.go
+++ b/src/runtime/defs_linux_mips64x.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (mips64 || mips64le) && linux
-// +build mips64 mips64le
-// +build linux
package runtime
diff --git a/src/runtime/defs_linux_mipsx.go b/src/runtime/defs_linux_mipsx.go
index e84d4979e13..ffbf5051eba 100644
--- a/src/runtime/defs_linux_mipsx.go
+++ b/src/runtime/defs_linux_mipsx.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (mips || mipsle) && linux
-// +build mips mipsle
-// +build linux
package runtime
diff --git a/src/runtime/defs_netbsd.go b/src/runtime/defs_netbsd.go
index 755992d18e0..df8bc579f25 100644
--- a/src/runtime/defs_netbsd.go
+++ b/src/runtime/defs_netbsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
Input to cgo.
diff --git a/src/runtime/defs_netbsd_386.go b/src/runtime/defs_netbsd_386.go
index 03c9c2de59e..2943ea3f13e 100644
--- a/src/runtime/defs_netbsd_386.go
+++ b/src/runtime/defs_netbsd_386.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
Input to cgo.
diff --git a/src/runtime/defs_netbsd_amd64.go b/src/runtime/defs_netbsd_amd64.go
index 9fda1d7d226..33d80ff53c0 100644
--- a/src/runtime/defs_netbsd_amd64.go
+++ b/src/runtime/defs_netbsd_amd64.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
Input to cgo.
diff --git a/src/runtime/defs_netbsd_arm.go b/src/runtime/defs_netbsd_arm.go
index e7f4f6cece7..74b37527df6 100644
--- a/src/runtime/defs_netbsd_arm.go
+++ b/src/runtime/defs_netbsd_arm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
Input to cgo.
diff --git a/src/runtime/defs_openbsd.go b/src/runtime/defs_openbsd.go
index f818dc44539..ec7d82a33cf 100644
--- a/src/runtime/defs_openbsd.go
+++ b/src/runtime/defs_openbsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
Input to cgo.
diff --git a/src/runtime/defs_solaris.go b/src/runtime/defs_solaris.go
index e644f9c6ddd..ec16c9dcce9 100644
--- a/src/runtime/defs_solaris.go
+++ b/src/runtime/defs_solaris.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
Input to cgo.
diff --git a/src/runtime/defs_solaris_amd64.go b/src/runtime/defs_solaris_amd64.go
index a0b38319a5d..56e4b38c5e4 100644
--- a/src/runtime/defs_solaris_amd64.go
+++ b/src/runtime/defs_solaris_amd64.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
Input to cgo.
diff --git a/src/runtime/env_posix.go b/src/runtime/env_posix.go
index 95517b2a958..44086c1d634 100644
--- a/src/runtime/env_posix.go
+++ b/src/runtime/env_posix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris || windows || plan9
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris windows plan9
package runtime
diff --git a/src/runtime/export_debug_regabiargs_off_test.go b/src/runtime/export_debug_regabiargs_off_test.go
index 5009003d27d..81f73925d58 100644
--- a/src/runtime/export_debug_regabiargs_off_test.go
+++ b/src/runtime/export_debug_regabiargs_off_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64 && linux && !goexperiment.regabiargs
-// +build amd64,linux,!goexperiment.regabiargs
package runtime
diff --git a/src/runtime/export_debug_regabiargs_on_test.go b/src/runtime/export_debug_regabiargs_on_test.go
index e1b72efd0f7..7d1ab6888e6 100644
--- a/src/runtime/export_debug_regabiargs_on_test.go
+++ b/src/runtime/export_debug_regabiargs_on_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64 && linux && goexperiment.regabiargs
-// +build amd64,linux,goexperiment.regabiargs
package runtime
diff --git a/src/runtime/export_debug_test.go b/src/runtime/export_debug_test.go
index a2cef02cf86..032a9b9725d 100644
--- a/src/runtime/export_debug_test.go
+++ b/src/runtime/export_debug_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64 && linux
-// +build amd64,linux
package runtime
diff --git a/src/runtime/export_futex_test.go b/src/runtime/export_futex_test.go
index 34c970d6d2d..03157d8eed3 100644
--- a/src/runtime/export_futex_test.go
+++ b/src/runtime/export_futex_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd || linux
-// +build dragonfly freebsd linux
package runtime
diff --git a/src/runtime/export_mmap_test.go b/src/runtime/export_mmap_test.go
index bf4a8158991..f9c3229316a 100644
--- a/src/runtime/export_mmap_test.go
+++ b/src/runtime/export_mmap_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
// Export guts for testing.
diff --git a/src/runtime/export_pipe2_test.go b/src/runtime/export_pipe2_test.go
index 26d8b7d1859..bdf39c60dfc 100644
--- a/src/runtime/export_pipe2_test.go
+++ b/src/runtime/export_pipe2_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build dragonfly freebsd linux netbsd openbsd solaris
package runtime
diff --git a/src/runtime/export_pipe_test.go b/src/runtime/export_pipe_test.go
index a0c6c0440d8..0583039982e 100644
--- a/src/runtime/export_pipe_test.go
+++ b/src/runtime/export_pipe_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin
-// +build aix darwin
package runtime
diff --git a/src/runtime/export_unix_test.go b/src/runtime/export_unix_test.go
index 215e234286b..9f046b95e04 100644
--- a/src/runtime/export_unix_test.go
+++ b/src/runtime/export_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package runtime
diff --git a/src/runtime/futex_test.go b/src/runtime/futex_test.go
index 10a735327a7..188d0c65252 100644
--- a/src/runtime/futex_test.go
+++ b/src/runtime/futex_test.go
@@ -7,8 +7,6 @@
// the test.
//go:build (dragonfly || freebsd || linux) && !race
-// +build dragonfly freebsd linux
-// +build !race
package runtime_test
diff --git a/src/runtime/hash32.go b/src/runtime/hash32.go
index 7c22c76b875..0616c7dd050 100644
--- a/src/runtime/hash32.go
+++ b/src/runtime/hash32.go
@@ -6,7 +6,6 @@
// wyhash: https://github.com/wangyi-fudan/wyhash/blob/ceb019b530e2c1c14d70b79bfa2bc49de7d95bc1/Modern%20Non-Cryptographic%20Hash%20Function%20and%20Pseudorandom%20Number%20Generator.pdf
//go:build 386 || arm || mips || mipsle
-// +build 386 arm mips mipsle
package runtime
diff --git a/src/runtime/hash64.go b/src/runtime/hash64.go
index 5f7d00bf7f0..f773eb929cd 100644
--- a/src/runtime/hash64.go
+++ b/src/runtime/hash64.go
@@ -6,7 +6,6 @@
// wyhash: https://github.com/wangyi-fudan/wyhash
//go:build amd64 || arm64 || mips64 || mips64le || ppc64 || ppc64le || riscv64 || s390x || wasm
-// +build amd64 arm64 mips64 mips64le ppc64 ppc64le riscv64 s390x wasm
package runtime
diff --git a/src/runtime/internal/atomic/atomic_386.go b/src/runtime/internal/atomic/atomic_386.go
index d4aed6b6717..27a77ec37a9 100644
--- a/src/runtime/internal/atomic/atomic_386.go
+++ b/src/runtime/internal/atomic/atomic_386.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build 386
-// +build 386
package atomic
diff --git a/src/runtime/internal/atomic/atomic_arm.go b/src/runtime/internal/atomic/atomic_arm.go
index 2e9374ca269..e2539b6c7ec 100644
--- a/src/runtime/internal/atomic/atomic_arm.go
+++ b/src/runtime/internal/atomic/atomic_arm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build arm
-// +build arm
package atomic
diff --git a/src/runtime/internal/atomic/atomic_arm64.go b/src/runtime/internal/atomic/atomic_arm64.go
index dbb1796ec09..459fb9978db 100644
--- a/src/runtime/internal/atomic/atomic_arm64.go
+++ b/src/runtime/internal/atomic/atomic_arm64.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build arm64
-// +build arm64
package atomic
diff --git a/src/runtime/internal/atomic/atomic_mips64x.go b/src/runtime/internal/atomic/atomic_mips64x.go
index 5b407ebc7a5..1e12b83801d 100644
--- a/src/runtime/internal/atomic/atomic_mips64x.go
+++ b/src/runtime/internal/atomic/atomic_mips64x.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build mips64 || mips64le
-// +build mips64 mips64le
package atomic
diff --git a/src/runtime/internal/atomic/atomic_mipsx.go b/src/runtime/internal/atomic/atomic_mipsx.go
index 80cd65b3338..e552e574952 100644
--- a/src/runtime/internal/atomic/atomic_mipsx.go
+++ b/src/runtime/internal/atomic/atomic_mipsx.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build mips || mipsle
-// +build mips mipsle
// Export some functions via linkname to assembly in sync/atomic.
//go:linkname Xadd64
diff --git a/src/runtime/internal/atomic/atomic_ppc64x.go b/src/runtime/internal/atomic/atomic_ppc64x.go
index 98101e32878..998d16e3f68 100644
--- a/src/runtime/internal/atomic/atomic_ppc64x.go
+++ b/src/runtime/internal/atomic/atomic_ppc64x.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ppc64 || ppc64le
-// +build ppc64 ppc64le
package atomic
diff --git a/src/runtime/internal/atomic/stubs.go b/src/runtime/internal/atomic/stubs.go
index e7544ba4484..7df8d9c8632 100644
--- a/src/runtime/internal/atomic/stubs.go
+++ b/src/runtime/internal/atomic/stubs.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !wasm
-// +build !wasm
package atomic
diff --git a/src/runtime/internal/atomic/types_64bit.go b/src/runtime/internal/atomic/types_64bit.go
index 9e5ed68419b..43c1ba27096 100644
--- a/src/runtime/internal/atomic/types_64bit.go
+++ b/src/runtime/internal/atomic/types_64bit.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64 || arm64 || mips64 || mips64le || ppc64 || ppc64le || riscv64 || s390x || wasm
-// +build amd64 arm64 mips64 mips64le ppc64 ppc64le riscv64 s390x wasm
package atomic
diff --git a/src/runtime/internal/sys/intrinsics.go b/src/runtime/internal/sys/intrinsics.go
index e76d8dd0646..5af49011e9e 100644
--- a/src/runtime/internal/sys/intrinsics.go
+++ b/src/runtime/internal/sys/intrinsics.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !386
-// +build !386
// TODO finish intrinsifying 386, deadcode the assembly, remove build tags, merge w/ intrinsics_common
// TODO replace all uses of CtzXX with TrailingZerosXX; they are the same.
diff --git a/src/runtime/internal/sys/intrinsics_stubs.go b/src/runtime/internal/sys/intrinsics_stubs.go
index bf1494d48aa..a020652f760 100644
--- a/src/runtime/internal/sys/intrinsics_stubs.go
+++ b/src/runtime/internal/sys/intrinsics_stubs.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build 386
-// +build 386
package sys
diff --git a/src/runtime/lfstack_32bit.go b/src/runtime/lfstack_32bit.go
index c00f0965bd6..405923cc34e 100644
--- a/src/runtime/lfstack_32bit.go
+++ b/src/runtime/lfstack_32bit.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build 386 || arm || mips || mipsle
-// +build 386 arm mips mipsle
package runtime
diff --git a/src/runtime/lfstack_64bit.go b/src/runtime/lfstack_64bit.go
index 4812dd11565..3f0e4808977 100644
--- a/src/runtime/lfstack_64bit.go
+++ b/src/runtime/lfstack_64bit.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64 || arm64 || mips64 || mips64le || ppc64 || ppc64le || riscv64 || s390x || wasm
-// +build amd64 arm64 mips64 mips64le ppc64 ppc64le riscv64 s390x wasm
package runtime
diff --git a/src/runtime/libfuzzer.go b/src/runtime/libfuzzer.go
index 578bce04149..e7b3cdc46a9 100644
--- a/src/runtime/libfuzzer.go
+++ b/src/runtime/libfuzzer.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build libfuzzer
-// +build libfuzzer
package runtime
diff --git a/src/runtime/lock_futex.go b/src/runtime/lock_futex.go
index e4c8d01941d..575df7a1d57 100644
--- a/src/runtime/lock_futex.go
+++ b/src/runtime/lock_futex.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd || linux
-// +build dragonfly freebsd linux
package runtime
diff --git a/src/runtime/lock_js.go b/src/runtime/lock_js.go
index 0ca3512baf3..80ee50da351 100644
--- a/src/runtime/lock_js.go
+++ b/src/runtime/lock_js.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js && wasm
-// +build js,wasm
package runtime
diff --git a/src/runtime/lock_sema.go b/src/runtime/lock_sema.go
index 7a6af28b561..db36df1f375 100644
--- a/src/runtime/lock_sema.go
+++ b/src/runtime/lock_sema.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || netbsd || openbsd || plan9 || solaris || windows
-// +build aix darwin netbsd openbsd plan9 solaris windows
package runtime
diff --git a/src/runtime/lockrank_off.go b/src/runtime/lockrank_off.go
index f3d2c009145..daa45b542dd 100644
--- a/src/runtime/lockrank_off.go
+++ b/src/runtime/lockrank_off.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !goexperiment.staticlockranking
-// +build !goexperiment.staticlockranking
package runtime
diff --git a/src/runtime/lockrank_on.go b/src/runtime/lockrank_on.go
index fc8d2dc8d11..3c8c367c19f 100644
--- a/src/runtime/lockrank_on.go
+++ b/src/runtime/lockrank_on.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build goexperiment.staticlockranking
-// +build goexperiment.staticlockranking
package runtime
diff --git a/src/runtime/mem_bsd.go b/src/runtime/mem_bsd.go
index dcbb9a1d51e..b1525717921 100644
--- a/src/runtime/mem_bsd.go
+++ b/src/runtime/mem_bsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd || netbsd || openbsd || solaris
-// +build dragonfly freebsd netbsd openbsd solaris
package runtime
diff --git a/src/runtime/mem_js.go b/src/runtime/mem_js.go
index fe940360c0e..4ca486ac4b7 100644
--- a/src/runtime/mem_js.go
+++ b/src/runtime/mem_js.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js && wasm
-// +build js,wasm
package runtime
diff --git a/src/runtime/mkduff.go b/src/runtime/mkduff.go
index f3c3d8dfb58..d05158975fc 100644
--- a/src/runtime/mkduff.go
+++ b/src/runtime/mkduff.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
// runtime·duffzero is a Duff's device for zeroing memory.
// The compiler jumps to computed addresses within
diff --git a/src/runtime/mkfastlog2table.go b/src/runtime/mkfastlog2table.go
index 8d78a3923a0..a55f54751c9 100644
--- a/src/runtime/mkfastlog2table.go
+++ b/src/runtime/mkfastlog2table.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
// fastlog2Table contains log2 approximations for 5 binary digits.
// This is used to implement fastlog2, which is used for heap sampling.
diff --git a/src/runtime/mkpreempt.go b/src/runtime/mkpreempt.go
index d87446d0361..acfb518d106 100644
--- a/src/runtime/mkpreempt.go
+++ b/src/runtime/mkpreempt.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
// mkpreempt generates the asyncPreempt functions for each
// architecture.
diff --git a/src/runtime/mksizeclasses.go b/src/runtime/mksizeclasses.go
index b1b10e9e023..64ed8443292 100644
--- a/src/runtime/mksizeclasses.go
+++ b/src/runtime/mksizeclasses.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
// Generate tables for small malloc size classes.
//
diff --git a/src/runtime/mmap.go b/src/runtime/mmap.go
index 7460eb31046..3280a62e8dd 100644
--- a/src/runtime/mmap.go
+++ b/src/runtime/mmap.go
@@ -3,15 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !aix && !darwin && !js && (!linux || !amd64) && (!linux || !arm64) && !openbsd && !plan9 && !solaris && !windows
-// +build !aix
-// +build !darwin
-// +build !js
-// +build !linux !amd64
-// +build !linux !arm64
-// +build !openbsd
-// +build !plan9
-// +build !solaris
-// +build !windows
package runtime
diff --git a/src/runtime/mpagealloc_32bit.go b/src/runtime/mpagealloc_32bit.go
index fceb4e7a187..1d863f2fdaa 100644
--- a/src/runtime/mpagealloc_32bit.go
+++ b/src/runtime/mpagealloc_32bit.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build 386 || arm || mips || mipsle || wasm || (ios && arm64)
-// +build 386 arm mips mipsle wasm ios,arm64
// wasm is a treated as a 32-bit architecture for the purposes of the page
// allocator, even though it has 64-bit pointers. This is because any wasm
diff --git a/src/runtime/mpagealloc_64bit.go b/src/runtime/mpagealloc_64bit.go
index 16577346a7f..782628c91d0 100644
--- a/src/runtime/mpagealloc_64bit.go
+++ b/src/runtime/mpagealloc_64bit.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64 || (!ios && arm64) || mips64 || mips64le || ppc64 || ppc64le || riscv64 || s390x
-// +build amd64 !ios,arm64 mips64 mips64le ppc64 ppc64le riscv64 s390x
// See mpagealloc_32bit.go for why ios/arm64 is excluded here.
diff --git a/src/runtime/msan.go b/src/runtime/msan.go
index 25aaf94e26c..902a1e9e744 100644
--- a/src/runtime/msan.go
+++ b/src/runtime/msan.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build msan
-// +build msan
package runtime
diff --git a/src/runtime/msan0.go b/src/runtime/msan0.go
index b1096a6750e..2f5fd2d9821 100644
--- a/src/runtime/msan0.go
+++ b/src/runtime/msan0.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !msan
-// +build !msan
// Dummy MSan support API, used when not built with -msan.
diff --git a/src/runtime/nbpipe_fcntl_libc_test.go b/src/runtime/nbpipe_fcntl_libc_test.go
index 076a722eb73..a9c8987438d 100644
--- a/src/runtime/nbpipe_fcntl_libc_test.go
+++ b/src/runtime/nbpipe_fcntl_libc_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || solaris
-// +build aix darwin solaris
package runtime_test
diff --git a/src/runtime/nbpipe_fcntl_unix_test.go b/src/runtime/nbpipe_fcntl_unix_test.go
index 6d5e4ff0215..97607fa2cf7 100644
--- a/src/runtime/nbpipe_fcntl_unix_test.go
+++ b/src/runtime/nbpipe_fcntl_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd || linux || netbsd || openbsd
-// +build dragonfly freebsd linux netbsd openbsd
package runtime_test
diff --git a/src/runtime/nbpipe_pipe.go b/src/runtime/nbpipe_pipe.go
index b17257e9ec3..408e1ec410f 100644
--- a/src/runtime/nbpipe_pipe.go
+++ b/src/runtime/nbpipe_pipe.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin
-// +build aix darwin
package runtime
diff --git a/src/runtime/nbpipe_pipe2.go b/src/runtime/nbpipe_pipe2.go
index f22b2b591fd..6a555bcd997 100644
--- a/src/runtime/nbpipe_pipe2.go
+++ b/src/runtime/nbpipe_pipe2.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build dragonfly freebsd linux netbsd openbsd solaris
package runtime
diff --git a/src/runtime/nbpipe_test.go b/src/runtime/nbpipe_test.go
index 1d6a9b525c8..36342cfde83 100644
--- a/src/runtime/nbpipe_test.go
+++ b/src/runtime/nbpipe_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package runtime_test
diff --git a/src/runtime/netpoll.go b/src/runtime/netpoll.go
index 1008b4422cc..f60e62dec71 100644
--- a/src/runtime/netpoll.go
+++ b/src/runtime/netpoll.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris || windows
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris windows
package runtime
diff --git a/src/runtime/netpoll_epoll.go b/src/runtime/netpoll_epoll.go
index 371ac59f8e2..e0fb877d508 100644
--- a/src/runtime/netpoll_epoll.go
+++ b/src/runtime/netpoll_epoll.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux
-// +build linux
package runtime
diff --git a/src/runtime/netpoll_fake.go b/src/runtime/netpoll_fake.go
index 8366f289144..de1dcae7acf 100644
--- a/src/runtime/netpoll_fake.go
+++ b/src/runtime/netpoll_fake.go
@@ -6,7 +6,6 @@
// Should never be used, because wasm/js network connections do not honor "SetNonblock".
//go:build js && wasm
-// +build js,wasm
package runtime
diff --git a/src/runtime/netpoll_kqueue.go b/src/runtime/netpoll_kqueue.go
index 80d1b0cf18a..2f7f2848d29 100644
--- a/src/runtime/netpoll_kqueue.go
+++ b/src/runtime/netpoll_kqueue.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || netbsd || openbsd
-// +build darwin dragonfly freebsd netbsd openbsd
package runtime
diff --git a/src/runtime/netpoll_stub.go b/src/runtime/netpoll_stub.go
index 33ab8eba58c..d0a63bca866 100644
--- a/src/runtime/netpoll_stub.go
+++ b/src/runtime/netpoll_stub.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build plan9
-// +build plan9
package runtime
diff --git a/src/runtime/norace_linux_test.go b/src/runtime/norace_linux_test.go
index b199aa633c1..b188a2e88b7 100644
--- a/src/runtime/norace_linux_test.go
+++ b/src/runtime/norace_linux_test.go
@@ -4,7 +4,6 @@
// The file contains tests that cannot run under race detector for some reason.
//go:build !race
-// +build !race
package runtime_test
diff --git a/src/runtime/norace_test.go b/src/runtime/norace_test.go
index 9ad5dde3829..d49f2ec0dfd 100644
--- a/src/runtime/norace_test.go
+++ b/src/runtime/norace_test.go
@@ -4,7 +4,6 @@
// The file contains tests that cannot run under race detector for some reason.
//go:build !race
-// +build !race
package runtime_test
diff --git a/src/runtime/os_aix.go b/src/runtime/os_aix.go
index c21da4ddaaf..aeff593d50b 100644
--- a/src/runtime/os_aix.go
+++ b/src/runtime/os_aix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix
-// +build aix
package runtime
diff --git a/src/runtime/os_freebsd2.go b/src/runtime/os_freebsd2.go
index 7e266dc27e2..3eaedf0b8b9 100644
--- a/src/runtime/os_freebsd2.go
+++ b/src/runtime/os_freebsd2.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build freebsd && !amd64
-// +build freebsd,!amd64
package runtime
diff --git a/src/runtime/os_freebsd_noauxv.go b/src/runtime/os_freebsd_noauxv.go
index 8fe0cb6718f..1d9452bda5f 100644
--- a/src/runtime/os_freebsd_noauxv.go
+++ b/src/runtime/os_freebsd_noauxv.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build freebsd && !arm
-// +build freebsd,!arm
package runtime
diff --git a/src/runtime/os_js.go b/src/runtime/os_js.go
index 52b64e76027..9ed916705bc 100644
--- a/src/runtime/os_js.go
+++ b/src/runtime/os_js.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js && wasm
-// +build js,wasm
package runtime
diff --git a/src/runtime/os_linux_arm64.go b/src/runtime/os_linux_arm64.go
index 5260f22f573..2daa56fce75 100644
--- a/src/runtime/os_linux_arm64.go
+++ b/src/runtime/os_linux_arm64.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build arm64
-// +build arm64
package runtime
diff --git a/src/runtime/os_linux_be64.go b/src/runtime/os_linux_be64.go
index 498d7cec6d8..537515fcf25 100644
--- a/src/runtime/os_linux_be64.go
+++ b/src/runtime/os_linux_be64.go
@@ -5,8 +5,6 @@
// The standard Linux sigset type on big-endian 64-bit machines.
//go:build linux && (ppc64 || s390x)
-// +build linux
-// +build ppc64 s390x
package runtime
diff --git a/src/runtime/os_linux_generic.go b/src/runtime/os_linux_generic.go
index fe1973dbde6..bed9e66e156 100644
--- a/src/runtime/os_linux_generic.go
+++ b/src/runtime/os_linux_generic.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !mips && !mipsle && !mips64 && !mips64le && !s390x && !ppc64 && linux
-// +build !mips,!mipsle,!mips64,!mips64le,!s390x,!ppc64,linux
package runtime
diff --git a/src/runtime/os_linux_mips64x.go b/src/runtime/os_linux_mips64x.go
index bd76442dbd8..188db010348 100644
--- a/src/runtime/os_linux_mips64x.go
+++ b/src/runtime/os_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 runtime
diff --git a/src/runtime/os_linux_mipsx.go b/src/runtime/os_linux_mipsx.go
index ef8b3f7d434..73016f81d91 100644
--- a/src/runtime/os_linux_mipsx.go
+++ b/src/runtime/os_linux_mipsx.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux && (mips || mipsle)
-// +build linux
-// +build mips mipsle
package runtime
diff --git a/src/runtime/os_linux_noauxv.go b/src/runtime/os_linux_noauxv.go
index 59b5aacaebc..7b84f713d64 100644
--- a/src/runtime/os_linux_noauxv.go
+++ b/src/runtime/os_linux_noauxv.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux && !arm && !arm64 && !mips && !mipsle && !mips64 && !mips64le && !s390x && !ppc64 && !ppc64le
-// +build linux,!arm,!arm64,!mips,!mipsle,!mips64,!mips64le,!s390x,!ppc64,!ppc64le
package runtime
diff --git a/src/runtime/os_linux_novdso.go b/src/runtime/os_linux_novdso.go
index 7e93d2ba830..b06716dc6a1 100644
--- a/src/runtime/os_linux_novdso.go
+++ b/src/runtime/os_linux_novdso.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux && !386 && !amd64 && !arm && !arm64 && !mips64 && !mips64le && !ppc64 && !ppc64le && !riscv64
-// +build linux,!386,!amd64,!arm,!arm64,!mips64,!mips64le,!ppc64,!ppc64le,!riscv64
package runtime
diff --git a/src/runtime/os_linux_ppc64x.go b/src/runtime/os_linux_ppc64x.go
index c093d2ec0f5..25d7ccc0356 100644
--- a/src/runtime/os_linux_ppc64x.go
+++ b/src/runtime/os_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 runtime
diff --git a/src/runtime/os_linux_x86.go b/src/runtime/os_linux_x86.go
index 5667774d82f..c88f61fa2e9 100644
--- a/src/runtime/os_linux_x86.go
+++ b/src/runtime/os_linux_x86.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux && (386 || amd64)
-// +build linux
-// +build 386 amd64
package runtime
diff --git a/src/runtime/os_nonopenbsd.go b/src/runtime/os_nonopenbsd.go
index 6134b6c02f2..a5775961e8f 100644
--- a/src/runtime/os_nonopenbsd.go
+++ b/src/runtime/os_nonopenbsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !openbsd
-// +build !openbsd
package runtime
diff --git a/src/runtime/os_only_solaris.go b/src/runtime/os_only_solaris.go
index 3829683c807..0c72500674f 100644
--- a/src/runtime/os_only_solaris.go
+++ b/src/runtime/os_only_solaris.go
@@ -5,7 +5,6 @@
// Solaris code that doesn't also apply to illumos.
//go:build !illumos
-// +build !illumos
package runtime
diff --git a/src/runtime/os_openbsd_libc.go b/src/runtime/os_openbsd_libc.go
index 981e49827fb..ff21eccb4b5 100644
--- a/src/runtime/os_openbsd_libc.go
+++ b/src/runtime/os_openbsd_libc.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build openbsd && !mips64
-// +build openbsd,!mips64
package runtime
diff --git a/src/runtime/os_openbsd_syscall.go b/src/runtime/os_openbsd_syscall.go
index 1ddee1864e4..8128c20453b 100644
--- a/src/runtime/os_openbsd_syscall.go
+++ b/src/runtime/os_openbsd_syscall.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build openbsd && mips64
-// +build openbsd,mips64
package runtime
diff --git a/src/runtime/os_openbsd_syscall1.go b/src/runtime/os_openbsd_syscall1.go
index c20ee8300e3..d32894ba6a3 100644
--- a/src/runtime/os_openbsd_syscall1.go
+++ b/src/runtime/os_openbsd_syscall1.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build openbsd && mips64
-// +build openbsd,mips64
package runtime
diff --git a/src/runtime/os_openbsd_syscall2.go b/src/runtime/os_openbsd_syscall2.go
index af1997131fe..99542fb2de1 100644
--- a/src/runtime/os_openbsd_syscall2.go
+++ b/src/runtime/os_openbsd_syscall2.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build openbsd && mips64
-// +build openbsd,mips64
package runtime
diff --git a/src/runtime/panic32.go b/src/runtime/panic32.go
index acbdd1ff458..fa3f2bf2f8b 100644
--- a/src/runtime/panic32.go
+++ b/src/runtime/panic32.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build 386 || arm || mips || mipsle
-// +build 386 arm mips mipsle
package runtime
diff --git a/src/runtime/pprof/mprof_test.go b/src/runtime/pprof/mprof_test.go
index b4680fbdee9..b44b32aed2a 100644
--- a/src/runtime/pprof/mprof_test.go
+++ b/src/runtime/pprof/mprof_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
package pprof
@@ -105,31 +104,31 @@ func TestMemoryProfiler(t *testing.T) {
}{{
stk: []string{"runtime/pprof.allocatePersistent1K", "runtime/pprof.TestMemoryProfiler"},
legacy: fmt.Sprintf(`%v: %v \[%v: %v\] @ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+
-# 0x[0-9,a-f]+ runtime/pprof\.allocatePersistent1K\+0x[0-9,a-f]+ .*/runtime/pprof/mprof_test\.go:48
-# 0x[0-9,a-f]+ runtime/pprof\.TestMemoryProfiler\+0x[0-9,a-f]+ .*/runtime/pprof/mprof_test\.go:83
+# 0x[0-9,a-f]+ runtime/pprof\.allocatePersistent1K\+0x[0-9,a-f]+ .*/runtime/pprof/mprof_test\.go:47
+# 0x[0-9,a-f]+ runtime/pprof\.TestMemoryProfiler\+0x[0-9,a-f]+ .*/runtime/pprof/mprof_test\.go:82
`, 32*memoryProfilerRun, 1024*memoryProfilerRun, 32*memoryProfilerRun, 1024*memoryProfilerRun),
}, {
stk: []string{"runtime/pprof.allocateTransient1M", "runtime/pprof.TestMemoryProfiler"},
legacy: fmt.Sprintf(`0: 0 \[%v: %v\] @ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+
-# 0x[0-9,a-f]+ runtime/pprof\.allocateTransient1M\+0x[0-9,a-f]+ .*/runtime/pprof/mprof_test.go:25
-# 0x[0-9,a-f]+ runtime/pprof\.TestMemoryProfiler\+0x[0-9,a-f]+ .*/runtime/pprof/mprof_test.go:80
+# 0x[0-9,a-f]+ runtime/pprof\.allocateTransient1M\+0x[0-9,a-f]+ .*/runtime/pprof/mprof_test.go:24
+# 0x[0-9,a-f]+ runtime/pprof\.TestMemoryProfiler\+0x[0-9,a-f]+ .*/runtime/pprof/mprof_test.go:79
`, (1<<10)*memoryProfilerRun, (1<<20)*memoryProfilerRun),
}, {
stk: []string{"runtime/pprof.allocateTransient2M", "runtime/pprof.TestMemoryProfiler"},
legacy: fmt.Sprintf(`0: 0 \[%v: %v\] @ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+
-# 0x[0-9,a-f]+ runtime/pprof\.allocateTransient2M\+0x[0-9,a-f]+ .*/runtime/pprof/mprof_test.go:31
-# 0x[0-9,a-f]+ runtime/pprof\.TestMemoryProfiler\+0x[0-9,a-f]+ .*/runtime/pprof/mprof_test.go:81
+# 0x[0-9,a-f]+ runtime/pprof\.allocateTransient2M\+0x[0-9,a-f]+ .*/runtime/pprof/mprof_test.go:30
+# 0x[0-9,a-f]+ runtime/pprof\.TestMemoryProfiler\+0x[0-9,a-f]+ .*/runtime/pprof/mprof_test.go:80
`, memoryProfilerRun, (2<<20)*memoryProfilerRun),
}, {
stk: []string{"runtime/pprof.allocateTransient2MInline", "runtime/pprof.TestMemoryProfiler"},
legacy: fmt.Sprintf(`0: 0 \[%v: %v\] @ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+ 0x[0-9,a-f]+
-# 0x[0-9,a-f]+ runtime/pprof\.allocateTransient2MInline\+0x[0-9,a-f]+ .*/runtime/pprof/mprof_test.go:35
-# 0x[0-9,a-f]+ runtime/pprof\.TestMemoryProfiler\+0x[0-9,a-f]+ .*/runtime/pprof/mprof_test.go:82
+# 0x[0-9,a-f]+ runtime/pprof\.allocateTransient2MInline\+0x[0-9,a-f]+ .*/runtime/pprof/mprof_test.go:34
+# 0x[0-9,a-f]+ runtime/pprof\.TestMemoryProfiler\+0x[0-9,a-f]+ .*/runtime/pprof/mprof_test.go:81
`, memoryProfilerRun, (2<<20)*memoryProfilerRun),
}, {
stk: []string{"runtime/pprof.allocateReflectTransient"},
legacy: fmt.Sprintf(`0: 0 \[%v: %v\] @( 0x[0-9,a-f]+)+
-# 0x[0-9,a-f]+ runtime/pprof\.allocateReflectTransient\+0x[0-9,a-f]+ .*/runtime/pprof/mprof_test.go:56
+# 0x[0-9,a-f]+ runtime/pprof\.allocateReflectTransient\+0x[0-9,a-f]+ .*/runtime/pprof/mprof_test.go:55
`, memoryProfilerRun, (2<<20)*memoryProfilerRun),
}}
diff --git a/src/runtime/pprof/pprof_norusage.go b/src/runtime/pprof/pprof_norusage.go
index e175dd380cf..cbc5176cfa0 100644
--- a/src/runtime/pprof/pprof_norusage.go
+++ b/src/runtime/pprof/pprof_norusage.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !darwin && !linux
-// +build !darwin,!linux
package pprof
diff --git a/src/runtime/pprof/pprof_rusage.go b/src/runtime/pprof/pprof_rusage.go
index 269f21bc2f9..46263fedd96 100644
--- a/src/runtime/pprof/pprof_rusage.go
+++ b/src/runtime/pprof/pprof_rusage.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || linux
-// +build darwin linux
package pprof
diff --git a/src/runtime/pprof/pprof_test.go b/src/runtime/pprof/pprof_test.go
index 03ff55b5415..06e0274e9ab 100644
--- a/src/runtime/pprof/pprof_test.go
+++ b/src/runtime/pprof/pprof_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
package pprof
diff --git a/src/runtime/pprof/rusage_test.go b/src/runtime/pprof/rusage_test.go
index 66b1b3bbe10..b0d651e0ebb 100644
--- a/src/runtime/pprof/rusage_test.go
+++ b/src/runtime/pprof/rusage_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || freebsd || linux || netbsd || openbsd
-// +build darwin freebsd linux netbsd openbsd
package pprof
diff --git a/src/runtime/preempt_nonwindows.go b/src/runtime/preempt_nonwindows.go
index 365e86a611a..d6a2408cb7c 100644
--- a/src/runtime/preempt_nonwindows.go
+++ b/src/runtime/preempt_nonwindows.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !windows
-// +build !windows
package runtime
diff --git a/src/runtime/race.go b/src/runtime/race.go
index 7eaa9d2b721..e019923bb5c 100644
--- a/src/runtime/race.go
+++ b/src/runtime/race.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build race
-// +build race
package runtime
diff --git a/src/runtime/race/output_test.go b/src/runtime/race/output_test.go
index 63fcd847dc7..46cdfcd0e98 100644
--- a/src/runtime/race/output_test.go
+++ b/src/runtime/race/output_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build race
-// +build race
package race_test
diff --git a/src/runtime/race/race.go b/src/runtime/race/race.go
index 84050e87711..63fa83ff146 100644
--- a/src/runtime/race/race.go
+++ b/src/runtime/race/race.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (race && linux && amd64) || (race && freebsd && amd64) || (race && netbsd && amd64) || (race && darwin && amd64) || (race && windows && amd64) || (race && linux && ppc64le) || (race && linux && arm64) || (race && darwin && arm64) || (race && openbsd && amd64)
-// +build race,linux,amd64 race,freebsd,amd64 race,netbsd,amd64 race,darwin,amd64 race,windows,amd64 race,linux,ppc64le race,linux,arm64 race,darwin,arm64 race,openbsd,amd64
package race
diff --git a/src/runtime/race/race_linux_test.go b/src/runtime/race/race_linux_test.go
index 9c0d48d6bda..e8a2d0fd8c9 100644
--- a/src/runtime/race/race_linux_test.go
+++ b/src/runtime/race/race_linux_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux && race
-// +build linux,race
package race_test
diff --git a/src/runtime/race/race_test.go b/src/runtime/race/race_test.go
index 8c880b85700..1677e139865 100644
--- a/src/runtime/race/race_test.go
+++ b/src/runtime/race/race_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build race
-// +build race
// This program is used to verify the race detector
// by running the tests and parsing their output.
diff --git a/src/runtime/race/race_unix_test.go b/src/runtime/race/race_unix_test.go
index acd6e47f982..6cc0730589f 100644
--- a/src/runtime/race/race_unix_test.go
+++ b/src/runtime/race/race_unix_test.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build race && (darwin || freebsd || linux)
-// +build race
-// +build darwin freebsd linux
package race_test
diff --git a/src/runtime/race/race_windows_test.go b/src/runtime/race/race_windows_test.go
index e490d766dd0..143b483f97f 100644
--- a/src/runtime/race/race_windows_test.go
+++ b/src/runtime/race/race_windows_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build windows && race
-// +build windows,race
package race_test
diff --git a/src/runtime/race/sched_test.go b/src/runtime/race/sched_test.go
index e904ebd20d8..9fe83ea11d3 100644
--- a/src/runtime/race/sched_test.go
+++ b/src/runtime/race/sched_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build race
-// +build race
package race_test
diff --git a/src/runtime/race/syso_test.go b/src/runtime/race/syso_test.go
index f5095737a4f..2f1a91cab1d 100644
--- a/src/runtime/race/syso_test.go
+++ b/src/runtime/race/syso_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build race
-// +build race
package race
diff --git a/src/runtime/race/timer_test.go b/src/runtime/race/timer_test.go
index f11f8456a0f..dd590055642 100644
--- a/src/runtime/race/timer_test.go
+++ b/src/runtime/race/timer_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build race
-// +build race
package race_test
diff --git a/src/runtime/race0.go b/src/runtime/race0.go
index 0e431b8103e..f36d4387c74 100644
--- a/src/runtime/race0.go
+++ b/src/runtime/race0.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !race
-// +build !race
// Dummy race detection API, used when not built with -race.
diff --git a/src/runtime/relax_stub.go b/src/runtime/relax_stub.go
index 5b92879c20b..e507702fc10 100644
--- a/src/runtime/relax_stub.go
+++ b/src/runtime/relax_stub.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !windows
-// +build !windows
package runtime
diff --git a/src/runtime/runtime_mmap_test.go b/src/runtime/runtime_mmap_test.go
index f71f8afa574..9323c093557 100644
--- a/src/runtime/runtime_mmap_test.go
+++ b/src/runtime/runtime_mmap_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package runtime_test
diff --git a/src/runtime/runtime_unix_test.go b/src/runtime/runtime_unix_test.go
index 0251c676e6d..642a9462803 100644
--- a/src/runtime/runtime_unix_test.go
+++ b/src/runtime/runtime_unix_test.go
@@ -7,7 +7,6 @@
// and Close(-1) is nearly universally fast.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || plan9
-// +build aix darwin dragonfly freebsd linux netbsd openbsd plan9
package runtime_test
diff --git a/src/runtime/semasleep_test.go b/src/runtime/semasleep_test.go
index 905e932b7d8..cf4ef182084 100644
--- a/src/runtime/semasleep_test.go
+++ b/src/runtime/semasleep_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !plan9 && !windows && !js
-// +build !plan9,!windows,!js
package runtime_test
diff --git a/src/runtime/sigaction.go b/src/runtime/sigaction.go
index 30050efcc78..05f44f65dbc 100644
--- a/src/runtime/sigaction.go
+++ b/src/runtime/sigaction.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (linux && !amd64 && !arm64 && !ppc64le) || (freebsd && !amd64)
-// +build linux,!amd64,!arm64,!ppc64le freebsd,!amd64
package runtime
diff --git a/src/runtime/signal_386.go b/src/runtime/signal_386.go
index 69a59e6dcff..aa66032caa3 100644
--- a/src/runtime/signal_386.go
+++ b/src/runtime/signal_386.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd || linux || netbsd || openbsd
-// +build dragonfly freebsd linux netbsd openbsd
package runtime
diff --git a/src/runtime/signal_aix_ppc64.go b/src/runtime/signal_aix_ppc64.go
index 5999d9dc3d0..c6cb91a0a25 100644
--- a/src/runtime/signal_aix_ppc64.go
+++ b/src/runtime/signal_aix_ppc64.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix
-// +build aix
package runtime
diff --git a/src/runtime/signal_amd64.go b/src/runtime/signal_amd64.go
index 20490cffbf5..67a21950d71 100644
--- a/src/runtime/signal_amd64.go
+++ b/src/runtime/signal_amd64.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64 && (darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris)
-// +build amd64
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
package runtime
diff --git a/src/runtime/signal_arm.go b/src/runtime/signal_arm.go
index a0780788f80..fff302f4d4b 100644
--- a/src/runtime/signal_arm.go
+++ b/src/runtime/signal_arm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd || linux || netbsd || openbsd
-// +build dragonfly freebsd linux netbsd openbsd
package runtime
diff --git a/src/runtime/signal_arm64.go b/src/runtime/signal_arm64.go
index 9d4a8b8a99d..771585a8f9b 100644
--- a/src/runtime/signal_arm64.go
+++ b/src/runtime/signal_arm64.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || freebsd || linux || netbsd || openbsd
-// +build darwin freebsd linux netbsd openbsd
package runtime
diff --git a/src/runtime/signal_linux_mips64x.go b/src/runtime/signal_linux_mips64x.go
index e62d6a93fd2..9c2a2860016 100644
--- a/src/runtime/signal_linux_mips64x.go
+++ b/src/runtime/signal_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 runtime
diff --git a/src/runtime/signal_linux_mipsx.go b/src/runtime/signal_linux_mipsx.go
index f3969c5aac4..f11bfc9b3a2 100644
--- a/src/runtime/signal_linux_mipsx.go
+++ b/src/runtime/signal_linux_mipsx.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux && (mips || mipsle)
-// +build linux
-// +build mips mipsle
package runtime
diff --git a/src/runtime/signal_linux_ppc64x.go b/src/runtime/signal_linux_ppc64x.go
index d2eeb39eadd..31754289ece 100644
--- a/src/runtime/signal_linux_ppc64x.go
+++ b/src/runtime/signal_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 runtime
diff --git a/src/runtime/signal_mips64x.go b/src/runtime/signal_mips64x.go
index 87dfa724c47..cee1bf7a1b2 100644
--- a/src/runtime/signal_mips64x.go
+++ b/src/runtime/signal_mips64x.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (linux || openbsd) && (mips64 || mips64le)
-// +build linux openbsd
-// +build mips64 mips64le
package runtime
diff --git a/src/runtime/signal_mipsx.go b/src/runtime/signal_mipsx.go
index 5067799bd6b..ba92655152e 100644
--- a/src/runtime/signal_mipsx.go
+++ b/src/runtime/signal_mipsx.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux && (mips || mipsle)
-// +build linux
-// +build mips mipsle
package runtime
diff --git a/src/runtime/signal_ppc64x.go b/src/runtime/signal_ppc64x.go
index 8a39d599576..bdd354026cb 100644
--- a/src/runtime/signal_ppc64x.go
+++ b/src/runtime/signal_ppc64x.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (aix || linux) && (ppc64 || ppc64le)
-// +build aix linux
-// +build ppc64 ppc64le
package runtime
diff --git a/src/runtime/signal_riscv64.go b/src/runtime/signal_riscv64.go
index 8a24e4e36a9..5eeb227aa05 100644
--- a/src/runtime/signal_riscv64.go
+++ b/src/runtime/signal_riscv64.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux && riscv64
-// +build linux,riscv64
package runtime
diff --git a/src/runtime/signal_unix.go b/src/runtime/signal_unix.go
index 8854629224d..7c454437e4d 100644
--- a/src/runtime/signal_unix.go
+++ b/src/runtime/signal_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package runtime
diff --git a/src/runtime/signal_windows_test.go b/src/runtime/signal_windows_test.go
index 1b7cb9d4c45..7c88ab573ea 100644
--- a/src/runtime/signal_windows_test.go
+++ b/src/runtime/signal_windows_test.go
@@ -1,5 +1,4 @@
//go:build windows
-// +build windows
package runtime_test
diff --git a/src/runtime/sigqueue.go b/src/runtime/sigqueue.go
index 6c91fb3fb35..7b84a0ef657 100644
--- a/src/runtime/sigqueue.go
+++ b/src/runtime/sigqueue.go
@@ -29,7 +29,6 @@
// nor deadlocks.
//go:build !plan9
-// +build !plan9
package runtime
diff --git a/src/runtime/sigqueue_note.go b/src/runtime/sigqueue_note.go
index e23446bea47..fb1a517fa57 100644
--- a/src/runtime/sigqueue_note.go
+++ b/src/runtime/sigqueue_note.go
@@ -8,7 +8,6 @@
// those functions. These functions will never be called.
//go:build !darwin && !plan9
-// +build !darwin,!plan9
package runtime
diff --git a/src/runtime/sigtab_linux_generic.go b/src/runtime/sigtab_linux_generic.go
index dc1debddab3..fe93bbafb59 100644
--- a/src/runtime/sigtab_linux_generic.go
+++ b/src/runtime/sigtab_linux_generic.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !mips && !mipsle && !mips64 && !mips64le && linux
-// +build !mips,!mipsle,!mips64,!mips64le,linux
package runtime
diff --git a/src/runtime/sigtab_linux_mipsx.go b/src/runtime/sigtab_linux_mipsx.go
index af9c7e56eb9..295ced5bbbb 100644
--- a/src/runtime/sigtab_linux_mipsx.go
+++ b/src/runtime/sigtab_linux_mipsx.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (mips || mipsle || mips64 || mips64le) && linux
-// +build mips mipsle mips64 mips64le
-// +build linux
package runtime
diff --git a/src/runtime/stubs2.go b/src/runtime/stubs2.go
index 525b324c816..9aa965454d9 100644
--- a/src/runtime/stubs2.go
+++ b/src/runtime/stubs2.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !aix && !darwin && !js && !openbsd && !plan9 && !solaris && !windows
-// +build !aix,!darwin,!js,!openbsd,!plan9,!solaris,!windows
package runtime
diff --git a/src/runtime/stubs3.go b/src/runtime/stubs3.go
index b895be4c707..891663b1109 100644
--- a/src/runtime/stubs3.go
+++ b/src/runtime/stubs3.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !aix && !darwin && !freebsd && !openbsd && !plan9 && !solaris
-// +build !aix,!darwin,!freebsd,!openbsd,!plan9,!solaris
package runtime
diff --git a/src/runtime/stubs_linux.go b/src/runtime/stubs_linux.go
index ba267009ca1..06c14e21601 100644
--- a/src/runtime/stubs_linux.go
+++ b/src/runtime/stubs_linux.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux
-// +build linux
package runtime
diff --git a/src/runtime/stubs_mips64x.go b/src/runtime/stubs_mips64x.go
index 05a4d0d38d5..a9ddfc02568 100644
--- a/src/runtime/stubs_mips64x.go
+++ b/src/runtime/stubs_mips64x.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build mips64 || mips64le
-// +build mips64 mips64le
package runtime
diff --git a/src/runtime/stubs_mipsx.go b/src/runtime/stubs_mipsx.go
index 9bffb35b67e..d48f9b88e82 100644
--- a/src/runtime/stubs_mipsx.go
+++ b/src/runtime/stubs_mipsx.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build mips || mipsle
-// +build mips mipsle
package runtime
diff --git a/src/runtime/stubs_nonlinux.go b/src/runtime/stubs_nonlinux.go
index f9b98595fc4..1a06d7cc1d6 100644
--- a/src/runtime/stubs_nonlinux.go
+++ b/src/runtime/stubs_nonlinux.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !linux
-// +build !linux
package runtime
diff --git a/src/runtime/stubs_ppc64.go b/src/runtime/stubs_ppc64.go
index 3895973f7c7..07127629d19 100644
--- a/src/runtime/stubs_ppc64.go
+++ b/src/runtime/stubs_ppc64.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux
-// +build linux
package runtime
diff --git a/src/runtime/stubs_ppc64x.go b/src/runtime/stubs_ppc64x.go
index 2c647ea6721..95e43a5162a 100644
--- a/src/runtime/stubs_ppc64x.go
+++ b/src/runtime/stubs_ppc64x.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ppc64le || ppc64
-// +build ppc64le ppc64
package runtime
diff --git a/src/runtime/sys_libc.go b/src/runtime/sys_libc.go
index b1a9f8b5365..7012b4167e9 100644
--- a/src/runtime/sys_libc.go
+++ b/src/runtime/sys_libc.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || (openbsd && !mips64)
-// +build darwin openbsd,!mips64
package runtime
diff --git a/src/runtime/sys_mips64x.go b/src/runtime/sys_mips64x.go
index 842a4a7084f..b71538409c6 100644
--- a/src/runtime/sys_mips64x.go
+++ b/src/runtime/sys_mips64x.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build mips64 || mips64le
-// +build mips64 mips64le
package runtime
diff --git a/src/runtime/sys_mipsx.go b/src/runtime/sys_mipsx.go
index 2038eb7d794..b60135f9649 100644
--- a/src/runtime/sys_mipsx.go
+++ b/src/runtime/sys_mipsx.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build mips || mipsle
-// +build mips mipsle
package runtime
diff --git a/src/runtime/sys_nonppc64x.go b/src/runtime/sys_nonppc64x.go
index 66821b1f76b..653f1c999f0 100644
--- a/src/runtime/sys_nonppc64x.go
+++ b/src/runtime/sys_nonppc64x.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !ppc64 && !ppc64le
-// +build !ppc64,!ppc64le
package runtime
diff --git a/src/runtime/sys_openbsd.go b/src/runtime/sys_openbsd.go
index 15888619b17..9f3a25fcf80 100644
--- a/src/runtime/sys_openbsd.go
+++ b/src/runtime/sys_openbsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build openbsd && !mips64
-// +build openbsd,!mips64
package runtime
diff --git a/src/runtime/sys_openbsd1.go b/src/runtime/sys_openbsd1.go
index b4e9f54538e..4b80f60226a 100644
--- a/src/runtime/sys_openbsd1.go
+++ b/src/runtime/sys_openbsd1.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build openbsd && !mips64
-// +build openbsd,!mips64
package runtime
diff --git a/src/runtime/sys_openbsd2.go b/src/runtime/sys_openbsd2.go
index 23e0b195fd1..7024cfa86d2 100644
--- a/src/runtime/sys_openbsd2.go
+++ b/src/runtime/sys_openbsd2.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build openbsd && !mips64
-// +build openbsd,!mips64
package runtime
diff --git a/src/runtime/sys_openbsd3.go b/src/runtime/sys_openbsd3.go
index a917ebde610..269bf86f10d 100644
--- a/src/runtime/sys_openbsd3.go
+++ b/src/runtime/sys_openbsd3.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build openbsd && !mips64
-// +build openbsd,!mips64
package runtime
diff --git a/src/runtime/sys_ppc64x.go b/src/runtime/sys_ppc64x.go
index 69bd99fa09e..56c5c9575e5 100644
--- a/src/runtime/sys_ppc64x.go
+++ b/src/runtime/sys_ppc64x.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ppc64 || ppc64le
-// +build ppc64 ppc64le
package runtime
diff --git a/src/runtime/sys_x86.go b/src/runtime/sys_x86.go
index 856c73a2f6c..9fb36c2a661 100644
--- a/src/runtime/sys_x86.go
+++ b/src/runtime/sys_x86.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64 || 386
-// +build amd64 386
package runtime
diff --git a/src/runtime/time_fake.go b/src/runtime/time_fake.go
index c790faba3d6..107f6be335a 100644
--- a/src/runtime/time_fake.go
+++ b/src/runtime/time_fake.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build faketime && !windows
-// +build faketime,!windows
// Faketime isn't currently supported on Windows. This would require
// modifying syscall.Write to call syscall.faketimeWrite,
diff --git a/src/runtime/time_nofake.go b/src/runtime/time_nofake.go
index 5a4ceaf43d2..2b85c5aa014 100644
--- a/src/runtime/time_nofake.go
+++ b/src/runtime/time_nofake.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !faketime
-// +build !faketime
package runtime
diff --git a/src/runtime/timeasm.go b/src/runtime/timeasm.go
index 468ff8a0d33..0421388686a 100644
--- a/src/runtime/timeasm.go
+++ b/src/runtime/timeasm.go
@@ -5,8 +5,6 @@
// Declarations for operating systems implementing time.now directly in assembly.
//go:build !faketime && (windows || (linux && amd64))
-// +build !faketime
-// +build windows linux,amd64
package runtime
diff --git a/src/runtime/timestub.go b/src/runtime/timestub.go
index 6f16c70b816..1d2926b43dc 100644
--- a/src/runtime/timestub.go
+++ b/src/runtime/timestub.go
@@ -6,9 +6,6 @@
// indirectly, in terms of walltime and nanotime assembly.
//go:build !faketime && !windows && !(linux && amd64)
-// +build !faketime
-// +build !windows
-// +build !linux !amd64
package runtime
diff --git a/src/runtime/timestub2.go b/src/runtime/timestub2.go
index 800a2a94e0a..b9a5cc6345e 100644
--- a/src/runtime/timestub2.go
+++ b/src/runtime/timestub2.go
@@ -3,13 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !aix && !darwin && !freebsd && !openbsd && !solaris && !windows && !(linux && amd64)
-// +build !aix
-// +build !darwin
-// +build !freebsd
-// +build !openbsd
-// +build !solaris
-// +build !windows
-// +build !linux !amd64
package runtime
diff --git a/src/runtime/tls_stub.go b/src/runtime/tls_stub.go
index 95dafd007c1..7bdfc6b89a6 100644
--- a/src/runtime/tls_stub.go
+++ b/src/runtime/tls_stub.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (windows && !amd64) || !windows
-// +build windows,!amd64 !windows
package runtime
diff --git a/src/runtime/vdso_elf32.go b/src/runtime/vdso_elf32.go
index 456173b0f51..1b8afbedf45 100644
--- a/src/runtime/vdso_elf32.go
+++ b/src/runtime/vdso_elf32.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux && (386 || arm)
-// +build linux
-// +build 386 arm
package runtime
diff --git a/src/runtime/vdso_elf64.go b/src/runtime/vdso_elf64.go
index aecc84dcfe5..d46d6f8c34d 100644
--- a/src/runtime/vdso_elf64.go
+++ b/src/runtime/vdso_elf64.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux && (amd64 || arm64 || mips64 || mips64le || ppc64 || ppc64le || riscv64)
-// +build linux
-// +build amd64 arm64 mips64 mips64le ppc64 ppc64le riscv64
package runtime
diff --git a/src/runtime/vdso_freebsd.go b/src/runtime/vdso_freebsd.go
index 7ca7b2810bf..0fe21cf6470 100644
--- a/src/runtime/vdso_freebsd.go
+++ b/src/runtime/vdso_freebsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build freebsd
-// +build freebsd
package runtime
diff --git a/src/runtime/vdso_freebsd_x86.go b/src/runtime/vdso_freebsd_x86.go
index 23a5a8c3227..5324a3d4cb3 100644
--- a/src/runtime/vdso_freebsd_x86.go
+++ b/src/runtime/vdso_freebsd_x86.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build freebsd && (386 || amd64)
-// +build freebsd
-// +build 386 amd64
package runtime
diff --git a/src/runtime/vdso_in_none.go b/src/runtime/vdso_in_none.go
index 3e98b08b151..618bd39b42b 100644
--- a/src/runtime/vdso_in_none.go
+++ b/src/runtime/vdso_in_none.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (linux && !386 && !amd64 && !arm && !arm64 && !mips64 && !mips64le && !ppc64 && !ppc64le && !riscv64) || !linux
-// +build linux,!386,!amd64,!arm,!arm64,!mips64,!mips64le,!ppc64,!ppc64le,!riscv64 !linux
package runtime
diff --git a/src/runtime/vdso_linux.go b/src/runtime/vdso_linux.go
index 20c8db78bee..cff2000767f 100644
--- a/src/runtime/vdso_linux.go
+++ b/src/runtime/vdso_linux.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux && (386 || amd64 || arm || arm64 || mips64 || mips64le || ppc64 || ppc64le || riscv64)
-// +build linux
-// +build 386 amd64 arm arm64 mips64 mips64le ppc64 ppc64le riscv64
package runtime
diff --git a/src/runtime/vdso_linux_mips64x.go b/src/runtime/vdso_linux_mips64x.go
index 395ddbba69a..1444f8e5246 100644
--- a/src/runtime/vdso_linux_mips64x.go
+++ b/src/runtime/vdso_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 runtime
diff --git a/src/runtime/vdso_linux_ppc64x.go b/src/runtime/vdso_linux_ppc64x.go
index b741dbfcdc5..09c8d9d20ed 100644
--- a/src/runtime/vdso_linux_ppc64x.go
+++ b/src/runtime/vdso_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 runtime
diff --git a/src/runtime/vlrt.go b/src/runtime/vlrt.go
index 927b585a92c..1dcb125aef5 100644
--- a/src/runtime/vlrt.go
+++ b/src/runtime/vlrt.go
@@ -24,7 +24,6 @@
// THE SOFTWARE.
//go:build arm || 386 || mips || mipsle
-// +build arm 386 mips mipsle
package runtime
diff --git a/src/runtime/wincallback.go b/src/runtime/wincallback.go
index 73f1e567cec..ca9965979fd 100644
--- a/src/runtime/wincallback.go
+++ b/src/runtime/wincallback.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
// Generate Windows callback assembly file.
diff --git a/src/runtime/write_err.go b/src/runtime/write_err.go
index a4656fd7281..81ae872e9c0 100644
--- a/src/runtime/write_err.go
+++ b/src/runtime/write_err.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !android
-// +build !android
package runtime
diff --git a/src/sync/pool_test.go b/src/sync/pool_test.go
index 65666daab48..f94153c8d78 100644
--- a/src/sync/pool_test.go
+++ b/src/sync/pool_test.go
@@ -4,7 +4,6 @@
// Pool is no-op under race detector, so all these tests do not work.
//go:build !race
-// +build !race
package sync_test
diff --git a/src/sync/runtime2.go b/src/sync/runtime2.go
index c4b44893f0e..9b7e9922fba 100644
--- a/src/sync/runtime2.go
+++ b/src/sync/runtime2.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !goexperiment.staticlockranking
-// +build !goexperiment.staticlockranking
package sync
diff --git a/src/sync/runtime2_lockrank.go b/src/sync/runtime2_lockrank.go
index e91fdb6c1ff..cdb1af41c69 100644
--- a/src/sync/runtime2_lockrank.go
+++ b/src/sync/runtime2_lockrank.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build goexperiment.staticlockranking
-// +build goexperiment.staticlockranking
package sync
diff --git a/src/syscall/bpf_bsd.go b/src/syscall/bpf_bsd.go
index 452d4cf14b6..735c0788950 100644
--- a/src/syscall/bpf_bsd.go
+++ b/src/syscall/bpf_bsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd || netbsd || openbsd
-// +build dragonfly freebsd netbsd openbsd
// Berkeley packet filter for BSD variants
diff --git a/src/syscall/creds_test.go b/src/syscall/creds_test.go
index c1a8b516e81..1ee56fc3401 100644
--- a/src/syscall/creds_test.go
+++ b/src/syscall/creds_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux
-// +build linux
package syscall_test
diff --git a/src/syscall/dirent.go b/src/syscall/dirent.go
index 9e1222e81c6..237ea79ad62 100644
--- a/src/syscall/dirent.go
+++ b/src/syscall/dirent.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris
package syscall
diff --git a/src/syscall/dirent_test.go b/src/syscall/dirent_test.go
index 71b445ba9b5..6570bf92179 100644
--- a/src/syscall/dirent_test.go
+++ b/src/syscall/dirent_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package syscall_test
diff --git a/src/syscall/endian_big.go b/src/syscall/endian_big.go
index dc0947fa6e8..8e3874eb863 100644
--- a/src/syscall/endian_big.go
+++ b/src/syscall/endian_big.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//
//go:build ppc64 || s390x || mips || mips64
-// +build ppc64 s390x mips mips64
package syscall
diff --git a/src/syscall/endian_little.go b/src/syscall/endian_little.go
index a894445f73c..edfb6cf164a 100644
--- a/src/syscall/endian_little.go
+++ b/src/syscall/endian_little.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//
//go:build 386 || amd64 || arm || arm64 || ppc64le || mips64le || mipsle || riscv64 || wasm
-// +build 386 amd64 arm arm64 ppc64le mips64le mipsle riscv64 wasm
package syscall
diff --git a/src/syscall/env_unix.go b/src/syscall/env_unix.go
index 022ef6ed734..521967c79f5 100644
--- a/src/syscall/env_unix.go
+++ b/src/syscall/env_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris || plan9
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris plan9
// Unix environment variables.
diff --git a/src/syscall/exec_aix_test.go b/src/syscall/exec_aix_test.go
index 17c7ac0664a..f2d54a40bd1 100644
--- a/src/syscall/exec_aix_test.go
+++ b/src/syscall/exec_aix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix
-// +build aix
package syscall
diff --git a/src/syscall/exec_bsd.go b/src/syscall/exec_bsd.go
index d2e50e3dd34..148f5a91aa0 100644
--- a/src/syscall/exec_bsd.go
+++ b/src/syscall/exec_bsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || netbsd || (openbsd && mips64)
-// +build dragonfly netbsd openbsd,mips64
package syscall
diff --git a/src/syscall/exec_libc.go b/src/syscall/exec_libc.go
index b14abd4e63b..c8549c49644 100644
--- a/src/syscall/exec_libc.go
+++ b/src/syscall/exec_libc.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || solaris
-// +build aix solaris
// This file handles forkAndExecInChild function for OS using libc syscall like AIX or Solaris.
diff --git a/src/syscall/exec_libc2.go b/src/syscall/exec_libc2.go
index bd98109d071..b05f053bbf3 100644
--- a/src/syscall/exec_libc2.go
+++ b/src/syscall/exec_libc2.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || (openbsd && !mips64)
-// +build darwin openbsd,!mips64
package syscall
diff --git a/src/syscall/exec_linux.go b/src/syscall/exec_linux.go
index e1506e1e2b7..0f0dee8ea5a 100644
--- a/src/syscall/exec_linux.go
+++ b/src/syscall/exec_linux.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux
-// +build linux
package syscall
diff --git a/src/syscall/exec_linux_test.go b/src/syscall/exec_linux_test.go
index 79b2633aca0..80440ca4d66 100644
--- a/src/syscall/exec_linux_test.go
+++ b/src/syscall/exec_linux_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux
-// +build linux
package syscall_test
diff --git a/src/syscall/exec_pdeathsig_test.go b/src/syscall/exec_pdeathsig_test.go
index 6533d3a1389..96ae27b494e 100644
--- a/src/syscall/exec_pdeathsig_test.go
+++ b/src/syscall/exec_pdeathsig_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build freebsd || linux
-// +build freebsd linux
package syscall_test
diff --git a/src/syscall/exec_solaris_test.go b/src/syscall/exec_solaris_test.go
index f54fc8385d5..90e5349bf45 100644
--- a/src/syscall/exec_solaris_test.go
+++ b/src/syscall/exec_solaris_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build solaris
-// +build solaris
package syscall
diff --git a/src/syscall/exec_unix.go b/src/syscall/exec_unix.go
index 54b18dccd73..64eb5ed9f04 100644
--- a/src/syscall/exec_unix.go
+++ b/src/syscall/exec_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
// Fork, exec, wait, etc.
diff --git a/src/syscall/exec_unix_test.go b/src/syscall/exec_unix_test.go
index 866671ba2ac..55f5f7025a0 100644
--- a/src/syscall/exec_unix_test.go
+++ b/src/syscall/exec_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package syscall_test
diff --git a/src/syscall/export_unix_test.go b/src/syscall/export_unix_test.go
index 2d2c67673d7..2f678d25664 100644
--- a/src/syscall/export_unix_test.go
+++ b/src/syscall/export_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd || linux || netbsd || openbsd
-// +build dragonfly freebsd linux netbsd openbsd
package syscall
diff --git a/src/syscall/flock.go b/src/syscall/flock.go
index 3b43b6aeded..8cb8f16153a 100644
--- a/src/syscall/flock.go
+++ b/src/syscall/flock.go
@@ -1,5 +1,4 @@
//go:build linux || freebsd || openbsd || netbsd || dragonfly
-// +build linux freebsd openbsd netbsd dragonfly
// Copyright 2014 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
diff --git a/src/syscall/flock_linux_32bit.go b/src/syscall/flock_linux_32bit.go
index 2f3277497cd..76a09fc47e3 100644
--- a/src/syscall/flock_linux_32bit.go
+++ b/src/syscall/flock_linux_32bit.go
@@ -6,7 +6,6 @@
// internal/syscall/unix/fcntl_linux_32bit.go.
//go:build (linux && 386) || (linux && arm) || (linux && mips) || (linux && mipsle)
-// +build linux,386 linux,arm linux,mips linux,mipsle
package syscall
diff --git a/src/syscall/forkpipe.go b/src/syscall/forkpipe.go
index 79cbdf4150f..6f7d29ce67a 100644
--- a/src/syscall/forkpipe.go
+++ b/src/syscall/forkpipe.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || solaris
-// +build aix darwin solaris
package syscall
diff --git a/src/syscall/forkpipe2.go b/src/syscall/forkpipe2.go
index e57240c1561..312244c0d8a 100644
--- a/src/syscall/forkpipe2.go
+++ b/src/syscall/forkpipe2.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd || netbsd || openbsd
-// +build dragonfly freebsd netbsd openbsd
package syscall
diff --git a/src/syscall/fs_js.go b/src/syscall/fs_js.go
index 01705162014..84a554e8b91 100644
--- a/src/syscall/fs_js.go
+++ b/src/syscall/fs_js.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js && wasm
-// +build js,wasm
package syscall
diff --git a/src/syscall/getdirentries_test.go b/src/syscall/getdirentries_test.go
index 814e656649b..ddd8208c154 100644
--- a/src/syscall/getdirentries_test.go
+++ b/src/syscall/getdirentries_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || freebsd || netbsd || openbsd
-// +build darwin freebsd netbsd openbsd
package syscall_test
diff --git a/src/syscall/mkasm.go b/src/syscall/mkasm.go
index e0ec46681d1..dce61f322c0 100644
--- a/src/syscall/mkasm.go
+++ b/src/syscall/mkasm.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
// mkasm.go generates assembly trampolines to call library routines from Go.
// This program must be run after mksyscall.pl.
diff --git a/src/syscall/mkpost.go b/src/syscall/mkpost.go
index 94e8d92eff8..4f81b81b57e 100644
--- a/src/syscall/mkpost.go
+++ b/src/syscall/mkpost.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
// mkpost processes the output of cgo -godefs to
// modify the generated types. It is used to clean up
diff --git a/src/syscall/mksyscall_windows.go b/src/syscall/mksyscall_windows.go
index d8e8a713c55..39517bc7f14 100644
--- a/src/syscall/mksyscall_windows.go
+++ b/src/syscall/mksyscall_windows.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
// mksyscall_windows wraps golang.org/x/sys/windows/mkwinsyscall.
package main
diff --git a/src/syscall/mmap_unix_test.go b/src/syscall/mmap_unix_test.go
index e3909f1afb0..3e9c08d67d3 100644
--- a/src/syscall/mmap_unix_test.go
+++ b/src/syscall/mmap_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd
-// +build aix darwin dragonfly freebsd linux netbsd openbsd
package syscall_test
diff --git a/src/syscall/msan.go b/src/syscall/msan.go
index 89fb75f03c9..89c580799fc 100644
--- a/src/syscall/msan.go
+++ b/src/syscall/msan.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build msan
-// +build msan
package syscall
diff --git a/src/syscall/msan0.go b/src/syscall/msan0.go
index 85097025a0b..fba8a5f716e 100644
--- a/src/syscall/msan0.go
+++ b/src/syscall/msan0.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !msan
-// +build !msan
package syscall
diff --git a/src/syscall/net_js.go b/src/syscall/net_js.go
index 2998c2159c8..4f8258ddb39 100644
--- a/src/syscall/net_js.go
+++ b/src/syscall/net_js.go
@@ -6,7 +6,6 @@
// This file only exists to make the compiler happy.
//go:build js && wasm
-// +build js,wasm
package syscall
diff --git a/src/syscall/ptrace_darwin.go b/src/syscall/ptrace_darwin.go
index b968c7c7f3a..519e451c73f 100644
--- a/src/syscall/ptrace_darwin.go
+++ b/src/syscall/ptrace_darwin.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !ios
-// +build !ios
package syscall
diff --git a/src/syscall/ptrace_ios.go b/src/syscall/ptrace_ios.go
index 5209d1e0dd1..fa8d0007154 100644
--- a/src/syscall/ptrace_ios.go
+++ b/src/syscall/ptrace_ios.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ios
-// +build ios
package syscall
diff --git a/src/syscall/route_bsd.go b/src/syscall/route_bsd.go
index e9321a4e645..8e47ff888e9 100644
--- a/src/syscall/route_bsd.go
+++ b/src/syscall/route_bsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || netbsd || openbsd
-// +build darwin dragonfly freebsd netbsd openbsd
package syscall
diff --git a/src/syscall/route_freebsd_32bit.go b/src/syscall/route_freebsd_32bit.go
index 412833a37cb..c70f0bb0d3c 100644
--- a/src/syscall/route_freebsd_32bit.go
+++ b/src/syscall/route_freebsd_32bit.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (freebsd && 386) || (freebsd && arm)
-// +build freebsd,386 freebsd,arm
package syscall
diff --git a/src/syscall/route_freebsd_64bit.go b/src/syscall/route_freebsd_64bit.go
index 5300bed4717..9febdfaf354 100644
--- a/src/syscall/route_freebsd_64bit.go
+++ b/src/syscall/route_freebsd_64bit.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build (freebsd && amd64) || (freebsd && arm64)
-// +build freebsd,amd64 freebsd,arm64
package syscall
diff --git a/src/syscall/setuidgid_32_linux.go b/src/syscall/setuidgid_32_linux.go
index 64897fe43c6..6920f33987c 100644
--- a/src/syscall/setuidgid_32_linux.go
+++ b/src/syscall/setuidgid_32_linux.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux && (386 || arm)
-// +build linux
-// +build 386 arm
package syscall
diff --git a/src/syscall/setuidgid_linux.go b/src/syscall/setuidgid_linux.go
index 3b36f66fa26..c995d258eb9 100644
--- a/src/syscall/setuidgid_linux.go
+++ b/src/syscall/setuidgid_linux.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux && !386 && !arm
-// +build linux,!386,!arm
package syscall
diff --git a/src/syscall/sockcmsg_unix.go b/src/syscall/sockcmsg_unix.go
index 99913b9a88b..a3dcf818da7 100644
--- a/src/syscall/sockcmsg_unix.go
+++ b/src/syscall/sockcmsg_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
// Socket control messages
diff --git a/src/syscall/sockcmsg_unix_other.go b/src/syscall/sockcmsg_unix_other.go
index bd8dcfa34cf..845bd9df990 100644
--- a/src/syscall/sockcmsg_unix_other.go
+++ b/src/syscall/sockcmsg_unix_other.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin freebsd linux netbsd openbsd solaris
package syscall
diff --git a/src/syscall/syscall_bsd.go b/src/syscall/syscall_bsd.go
index 40b1c07a901..ebe99ff2305 100644
--- a/src/syscall/syscall_bsd.go
+++ b/src/syscall/syscall_bsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || netbsd || openbsd
-// +build darwin dragonfly freebsd netbsd openbsd
// BSD system call wrappers shared by *BSD based systems
// including OS X (Darwin) and FreeBSD. Like the other
diff --git a/src/syscall/syscall_bsd_test.go b/src/syscall/syscall_bsd_test.go
index 2d8a8cbfe61..98fab1d3963 100644
--- a/src/syscall/syscall_bsd_test.go
+++ b/src/syscall/syscall_bsd_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || openbsd
-// +build darwin dragonfly freebsd openbsd
package syscall_test
diff --git a/src/syscall/syscall_freebsd_test.go b/src/syscall/syscall_freebsd_test.go
index 72cd133b85d..f04b12b6d3c 100644
--- a/src/syscall/syscall_freebsd_test.go
+++ b/src/syscall/syscall_freebsd_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build freebsd
-// +build freebsd
package syscall_test
diff --git a/src/syscall/syscall_illumos.go b/src/syscall/syscall_illumos.go
index ef95fe58f7c..de6b1600484 100644
--- a/src/syscall/syscall_illumos.go
+++ b/src/syscall/syscall_illumos.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build illumos
-// +build illumos
// Illumos system calls not present on Solaris.
diff --git a/src/syscall/syscall_js.go b/src/syscall/syscall_js.go
index ed70d622842..cd954990636 100644
--- a/src/syscall/syscall_js.go
+++ b/src/syscall/syscall_js.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js && wasm
-// +build js,wasm
package syscall
diff --git a/src/syscall/syscall_linux_mips64x.go b/src/syscall/syscall_linux_mips64x.go
index fa0d2799ed3..7c9dd80614a 100644
--- a/src/syscall/syscall_linux_mips64x.go
+++ b/src/syscall/syscall_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 syscall
diff --git a/src/syscall/syscall_linux_mipsx.go b/src/syscall/syscall_linux_mipsx.go
index 568523eb27d..741eeb14bbb 100644
--- a/src/syscall/syscall_linux_mipsx.go
+++ b/src/syscall/syscall_linux_mipsx.go
@@ -3,8 +3,6 @@
// license that can be found in the LICENSE file.
//go:build linux && (mips || mipsle)
-// +build linux
-// +build mips mipsle
package syscall
diff --git a/src/syscall/syscall_linux_ppc64x.go b/src/syscall/syscall_linux_ppc64x.go
index 3e73f6f2a4c..cc1b72e0e79 100644
--- a/src/syscall/syscall_linux_ppc64x.go
+++ b/src/syscall/syscall_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 syscall
diff --git a/src/syscall/syscall_openbsd1.go b/src/syscall/syscall_openbsd1.go
index 15870ce1ee1..bddeda637a9 100644
--- a/src/syscall/syscall_openbsd1.go
+++ b/src/syscall/syscall_openbsd1.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build openbsd && mips64
-// +build openbsd,mips64
package syscall
diff --git a/src/syscall/syscall_openbsd_libc.go b/src/syscall/syscall_openbsd_libc.go
index e67ee4e571c..15b68fd0fcf 100644
--- a/src/syscall/syscall_openbsd_libc.go
+++ b/src/syscall/syscall_openbsd_libc.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build openbsd && !mips64
-// +build openbsd,!mips64
package syscall
diff --git a/src/syscall/syscall_ptrace_test.go b/src/syscall/syscall_ptrace_test.go
index 45729d9e8e9..5b128de7795 100644
--- a/src/syscall/syscall_ptrace_test.go
+++ b/src/syscall/syscall_ptrace_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd
-// +build darwin dragonfly freebsd linux netbsd openbsd
package syscall_test
diff --git a/src/syscall/syscall_unix.go b/src/syscall/syscall_unix.go
index 101e39c7d08..9413db3832d 100644
--- a/src/syscall/syscall_unix.go
+++ b/src/syscall/syscall_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package syscall
diff --git a/src/syscall/syscall_unix_test.go b/src/syscall/syscall_unix_test.go
index af0bc856ee8..7cc78c2147b 100644
--- a/src/syscall/syscall_unix_test.go
+++ b/src/syscall/syscall_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package syscall_test
diff --git a/src/syscall/tables_js.go b/src/syscall/tables_js.go
index 64d958415d8..78a1e71a016 100644
--- a/src/syscall/tables_js.go
+++ b/src/syscall/tables_js.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js && wasm
-// +build js,wasm
package syscall
diff --git a/src/syscall/time_fake.go b/src/syscall/time_fake.go
index cf88aeb921a..b60fe60b03c 100644
--- a/src/syscall/time_fake.go
+++ b/src/syscall/time_fake.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build faketime
-// +build faketime
package syscall
diff --git a/src/syscall/time_nofake.go b/src/syscall/time_nofake.go
index 5eaa2daabd3..231875d8c3c 100644
--- a/src/syscall/time_nofake.go
+++ b/src/syscall/time_nofake.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !faketime
-// +build !faketime
package syscall
diff --git a/src/syscall/timestruct.go b/src/syscall/timestruct.go
index e4f3d50f56b..7cf4be45b12 100644
--- a/src/syscall/timestruct.go
+++ b/src/syscall/timestruct.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris
package syscall
diff --git a/src/syscall/types_aix.go b/src/syscall/types_aix.go
index 6588d690eab..9e05af90ee5 100644
--- a/src/syscall/types_aix.go
+++ b/src/syscall/types_aix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
Input to cgo -godefs. See also mkerrors.sh and mkall.sh
diff --git a/src/syscall/types_darwin.go b/src/syscall/types_darwin.go
index c2a32c0782e..c9404aaf1be 100644
--- a/src/syscall/types_darwin.go
+++ b/src/syscall/types_darwin.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
Input to cgo -godefs. See also mkerrors.sh and mkall.sh
diff --git a/src/syscall/types_dragonfly.go b/src/syscall/types_dragonfly.go
index 9f8d5bc3ddc..33420c4a924 100644
--- a/src/syscall/types_dragonfly.go
+++ b/src/syscall/types_dragonfly.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
Input to cgo -godefs. See also mkerrors.sh and mkall.sh
diff --git a/src/syscall/types_freebsd.go b/src/syscall/types_freebsd.go
index d7414117036..83bc7dc4997 100644
--- a/src/syscall/types_freebsd.go
+++ b/src/syscall/types_freebsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
Input to cgo -godefs. See also mkerrors.sh and mkall.sh
diff --git a/src/syscall/types_illumos_amd64.go b/src/syscall/types_illumos_amd64.go
index 254e3e7cfed..22c172f1f7d 100644
--- a/src/syscall/types_illumos_amd64.go
+++ b/src/syscall/types_illumos_amd64.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build illumos
-// +build illumos
// Illumos consts not present on Solaris. These are added manually rather than
// auto-generated by mkerror.sh
diff --git a/src/syscall/types_linux.go b/src/syscall/types_linux.go
index bf76be978bc..23a76edd902 100644
--- a/src/syscall/types_linux.go
+++ b/src/syscall/types_linux.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
Input to cgo -godefs. See also mkerrors.sh and mkall.sh
diff --git a/src/syscall/types_netbsd.go b/src/syscall/types_netbsd.go
index 0bd25ea3c95..e53e8c9386f 100644
--- a/src/syscall/types_netbsd.go
+++ b/src/syscall/types_netbsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
Input to cgo -godefs. See also mkerrors.sh and mkall.sh
diff --git a/src/syscall/types_openbsd.go b/src/syscall/types_openbsd.go
index 8b41cdca230..bfe6e9f592f 100644
--- a/src/syscall/types_openbsd.go
+++ b/src/syscall/types_openbsd.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
Input to cgo -godefs. See also mkerrors.sh and mkall.sh
diff --git a/src/syscall/types_solaris.go b/src/syscall/types_solaris.go
index 179f7914817..2f56bc06010 100644
--- a/src/syscall/types_solaris.go
+++ b/src/syscall/types_solaris.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
/*
Input to cgo -godefs. See also mkerrors.sh and mkall.sh
diff --git a/src/syscall/zerrors_darwin_amd64.go b/src/syscall/zerrors_darwin_amd64.go
index 0b9897284c4..ecbe89c5473 100644
--- a/src/syscall/zerrors_darwin_amd64.go
+++ b/src/syscall/zerrors_darwin_amd64.go
@@ -5,7 +5,6 @@
// cgo -godefs -- -m64 _const.go
//go:build amd64 && darwin
-// +build amd64,darwin
package syscall
diff --git a/src/syscall/zerrors_darwin_arm64.go b/src/syscall/zerrors_darwin_arm64.go
index 5f210fd1c40..fa7cb845c31 100644
--- a/src/syscall/zerrors_darwin_arm64.go
+++ b/src/syscall/zerrors_darwin_arm64.go
@@ -5,7 +5,6 @@
// cgo -godefs -- -m64 _const.go
//go:build arm64 && darwin
-// +build arm64,darwin
package syscall
diff --git a/src/syscall/zerrors_dragonfly_amd64.go b/src/syscall/zerrors_dragonfly_amd64.go
index 35e2a52d253..bca2f50c969 100644
--- a/src/syscall/zerrors_dragonfly_amd64.go
+++ b/src/syscall/zerrors_dragonfly_amd64.go
@@ -5,7 +5,6 @@
// cgo -godefs -- -m64 _const.go
//go:build amd64 && dragonfly
-// +build amd64,dragonfly
package syscall
diff --git a/src/syscall/zerrors_freebsd_386.go b/src/syscall/zerrors_freebsd_386.go
index aec26ad7785..b1441e76a3c 100644
--- a/src/syscall/zerrors_freebsd_386.go
+++ b/src/syscall/zerrors_freebsd_386.go
@@ -5,7 +5,6 @@
// cgo -godefs -- -m32 _const.go
//go:build 386 && freebsd
-// +build 386,freebsd
package syscall
diff --git a/src/syscall/zerrors_freebsd_amd64.go b/src/syscall/zerrors_freebsd_amd64.go
index d6d13e41558..3aed004986d 100644
--- a/src/syscall/zerrors_freebsd_amd64.go
+++ b/src/syscall/zerrors_freebsd_amd64.go
@@ -5,7 +5,6 @@
// cgo -godefs -- -m64 _const.go
//go:build amd64 && freebsd
-// +build amd64,freebsd
package syscall
diff --git a/src/syscall/zerrors_freebsd_arm.go b/src/syscall/zerrors_freebsd_arm.go
index 15c714fad81..e1f91ff86cb 100644
--- a/src/syscall/zerrors_freebsd_arm.go
+++ b/src/syscall/zerrors_freebsd_arm.go
@@ -5,7 +5,6 @@
// cgo -godefs -- _const.go
//go:build arm && freebsd
-// +build arm,freebsd
package syscall
diff --git a/src/syscall/zerrors_freebsd_arm64.go b/src/syscall/zerrors_freebsd_arm64.go
index b20ce7d8231..d0cb6c8ac75 100644
--- a/src/syscall/zerrors_freebsd_arm64.go
+++ b/src/syscall/zerrors_freebsd_arm64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build freebsd && arm64
-// +build freebsd,arm64
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
// cgo -godefs -- -m64 _const.go
diff --git a/src/syscall/zerrors_linux_386.go b/src/syscall/zerrors_linux_386.go
index fb64932ad62..5e4c867bc90 100644
--- a/src/syscall/zerrors_linux_386.go
+++ b/src/syscall/zerrors_linux_386.go
@@ -5,7 +5,6 @@
// cgo -godefs -- -m32 _const.go
//go:build 386 && linux
-// +build 386,linux
package syscall
diff --git a/src/syscall/zerrors_linux_amd64.go b/src/syscall/zerrors_linux_amd64.go
index 3a92bcdbb46..3ff6e498e78 100644
--- a/src/syscall/zerrors_linux_amd64.go
+++ b/src/syscall/zerrors_linux_amd64.go
@@ -5,7 +5,6 @@
// cgo -godefs -- -m64 _const.go
//go:build amd64 && linux
-// +build amd64,linux
package syscall
diff --git a/src/syscall/zerrors_linux_arm.go b/src/syscall/zerrors_linux_arm.go
index e013d8e7fd6..35825cc9fb4 100644
--- a/src/syscall/zerrors_linux_arm.go
+++ b/src/syscall/zerrors_linux_arm.go
@@ -5,7 +5,6 @@
// cgo -godefs -- _const.go
//go:build arm && linux
-// +build arm,linux
package syscall
diff --git a/src/syscall/zerrors_linux_arm64.go b/src/syscall/zerrors_linux_arm64.go
index 1a4d33e3fd5..444b8816d56 100644
--- a/src/syscall/zerrors_linux_arm64.go
+++ b/src/syscall/zerrors_linux_arm64.go
@@ -5,7 +5,6 @@
// cgo -godefs -- _const.go
//go:build arm64 && linux
-// +build arm64,linux
package syscall
diff --git a/src/syscall/zerrors_linux_ppc64.go b/src/syscall/zerrors_linux_ppc64.go
index 1dda43be70f..dd439acc582 100644
--- a/src/syscall/zerrors_linux_ppc64.go
+++ b/src/syscall/zerrors_linux_ppc64.go
@@ -5,7 +5,6 @@
// cgo -godefs -- -m64 _const.go
//go:build ppc64 && linux
-// +build ppc64,linux
package syscall
diff --git a/src/syscall/zerrors_linux_ppc64le.go b/src/syscall/zerrors_linux_ppc64le.go
index 6d56f1c9981..b71cb0b4e7e 100644
--- a/src/syscall/zerrors_linux_ppc64le.go
+++ b/src/syscall/zerrors_linux_ppc64le.go
@@ -5,7 +5,6 @@
// cgo -godefs -- -m64 _const.go
//go:build ppc64le && linux
-// +build ppc64le,linux
package syscall
diff --git a/src/syscall/zerrors_netbsd_386.go b/src/syscall/zerrors_netbsd_386.go
index 934e9ef073a..b2fcb65782e 100644
--- a/src/syscall/zerrors_netbsd_386.go
+++ b/src/syscall/zerrors_netbsd_386.go
@@ -5,7 +5,6 @@
// cgo -godefs -- -m32 _const.go
//go:build 386 && netbsd
-// +build 386,netbsd
package syscall
diff --git a/src/syscall/zerrors_netbsd_amd64.go b/src/syscall/zerrors_netbsd_amd64.go
index 0f5ad61a9f2..dc52c3ca573 100644
--- a/src/syscall/zerrors_netbsd_amd64.go
+++ b/src/syscall/zerrors_netbsd_amd64.go
@@ -5,7 +5,6 @@
// cgo -godefs -- -m64 _const.go
//go:build amd64 && netbsd
-// +build amd64,netbsd
package syscall
diff --git a/src/syscall/zerrors_netbsd_arm.go b/src/syscall/zerrors_netbsd_arm.go
index 9d8678750d4..3137e18a247 100644
--- a/src/syscall/zerrors_netbsd_arm.go
+++ b/src/syscall/zerrors_netbsd_arm.go
@@ -5,7 +5,6 @@
// cgo -godefs -- -marm _const.go
//go:build arm && netbsd
-// +build arm,netbsd
package syscall
diff --git a/src/syscall/zerrors_netbsd_arm64.go b/src/syscall/zerrors_netbsd_arm64.go
index 7adb72f7edd..cc1b0088c9a 100644
--- a/src/syscall/zerrors_netbsd_arm64.go
+++ b/src/syscall/zerrors_netbsd_arm64.go
@@ -5,7 +5,6 @@
// cgo -godefs -- -m64 _const.go
//go:build arm64 && netbsd
-// +build arm64,netbsd
package syscall
diff --git a/src/syscall/zerrors_openbsd_386.go b/src/syscall/zerrors_openbsd_386.go
index a8457c6edfe..d17ecb96e50 100644
--- a/src/syscall/zerrors_openbsd_386.go
+++ b/src/syscall/zerrors_openbsd_386.go
@@ -5,7 +5,6 @@
// cgo -godefs -- -m32 _const.go
//go:build 386 && openbsd
-// +build 386,openbsd
package syscall
diff --git a/src/syscall/zerrors_openbsd_amd64.go b/src/syscall/zerrors_openbsd_amd64.go
index eb19537a2ac..4904e7614f3 100644
--- a/src/syscall/zerrors_openbsd_amd64.go
+++ b/src/syscall/zerrors_openbsd_amd64.go
@@ -5,7 +5,6 @@
// cgo -godefs -- -m64 _const.go
//go:build amd64 && openbsd
-// +build amd64,openbsd
package syscall
diff --git a/src/syscall/zerrors_openbsd_arm.go b/src/syscall/zerrors_openbsd_arm.go
index 89a4e6d89a5..76ac9173a93 100644
--- a/src/syscall/zerrors_openbsd_arm.go
+++ b/src/syscall/zerrors_openbsd_arm.go
@@ -5,7 +5,6 @@
// cgo -godefs -- _const.go
//go:build arm && openbsd
-// +build arm,openbsd
package syscall
diff --git a/src/syscall/zerrors_solaris_amd64.go b/src/syscall/zerrors_solaris_amd64.go
index b7dee696029..fb25dacee43 100644
--- a/src/syscall/zerrors_solaris_amd64.go
+++ b/src/syscall/zerrors_solaris_amd64.go
@@ -5,7 +5,6 @@
// cgo -godefs -- -m64 _const.go
//go:build amd64 && solaris
-// +build amd64,solaris
package syscall
diff --git a/src/syscall/zsyscall_aix_ppc64.go b/src/syscall/zsyscall_aix_ppc64.go
index 134ae41165b..94f1b4371c5 100644
--- a/src/syscall/zsyscall_aix_ppc64.go
+++ b/src/syscall/zsyscall_aix_ppc64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build aix && ppc64
-// +build aix,ppc64
package syscall
diff --git a/src/syscall/zsyscall_darwin_amd64.go b/src/syscall/zsyscall_darwin_amd64.go
index ff88fef74ec..0ccdaf2d0ee 100644
--- a/src/syscall/zsyscall_darwin_amd64.go
+++ b/src/syscall/zsyscall_darwin_amd64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build darwin && amd64
-// +build darwin,amd64
package syscall
diff --git a/src/syscall/zsyscall_darwin_arm64.go b/src/syscall/zsyscall_darwin_arm64.go
index b096b5e6624..09bf34bb3c5 100644
--- a/src/syscall/zsyscall_darwin_arm64.go
+++ b/src/syscall/zsyscall_darwin_arm64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build darwin && arm64
-// +build darwin,arm64
package syscall
diff --git a/src/syscall/zsyscall_dragonfly_amd64.go b/src/syscall/zsyscall_dragonfly_amd64.go
index aa327c00109..5d5576d76ff 100644
--- a/src/syscall/zsyscall_dragonfly_amd64.go
+++ b/src/syscall/zsyscall_dragonfly_amd64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build dragonfly && amd64
-// +build dragonfly,amd64
package syscall
diff --git a/src/syscall/zsyscall_freebsd_386.go b/src/syscall/zsyscall_freebsd_386.go
index 7137d66f0b2..ed0eb9fa15e 100644
--- a/src/syscall/zsyscall_freebsd_386.go
+++ b/src/syscall/zsyscall_freebsd_386.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build freebsd && 386
-// +build freebsd,386
package syscall
diff --git a/src/syscall/zsyscall_freebsd_amd64.go b/src/syscall/zsyscall_freebsd_amd64.go
index d721dafde28..e291a567568 100644
--- a/src/syscall/zsyscall_freebsd_amd64.go
+++ b/src/syscall/zsyscall_freebsd_amd64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build freebsd && amd64
-// +build freebsd,amd64
package syscall
diff --git a/src/syscall/zsyscall_freebsd_arm.go b/src/syscall/zsyscall_freebsd_arm.go
index d9dbea921a1..7dd856fd970 100644
--- a/src/syscall/zsyscall_freebsd_arm.go
+++ b/src/syscall/zsyscall_freebsd_arm.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build freebsd && arm
-// +build freebsd,arm
package syscall
diff --git a/src/syscall/zsyscall_freebsd_arm64.go b/src/syscall/zsyscall_freebsd_arm64.go
index a24f0115e2c..229a9a22387 100644
--- a/src/syscall/zsyscall_freebsd_arm64.go
+++ b/src/syscall/zsyscall_freebsd_arm64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build freebsd && arm64
-// +build freebsd,arm64
package syscall
diff --git a/src/syscall/zsyscall_linux_386.go b/src/syscall/zsyscall_linux_386.go
index a1394d32cb6..c385dd3ca14 100644
--- a/src/syscall/zsyscall_linux_386.go
+++ b/src/syscall/zsyscall_linux_386.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build linux && 386
-// +build linux,386
package syscall
diff --git a/src/syscall/zsyscall_linux_amd64.go b/src/syscall/zsyscall_linux_amd64.go
index de6047d11c9..2059271324f 100644
--- a/src/syscall/zsyscall_linux_amd64.go
+++ b/src/syscall/zsyscall_linux_amd64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build linux && amd64
-// +build linux,amd64
package syscall
diff --git a/src/syscall/zsyscall_linux_arm.go b/src/syscall/zsyscall_linux_arm.go
index 3663b2eead1..50498c6eb67 100644
--- a/src/syscall/zsyscall_linux_arm.go
+++ b/src/syscall/zsyscall_linux_arm.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build linux && arm
-// +build linux,arm
package syscall
diff --git a/src/syscall/zsyscall_linux_arm64.go b/src/syscall/zsyscall_linux_arm64.go
index 19a9c0ca613..6714123f9c7 100644
--- a/src/syscall/zsyscall_linux_arm64.go
+++ b/src/syscall/zsyscall_linux_arm64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build linux && arm64
-// +build linux,arm64
package syscall
diff --git a/src/syscall/zsyscall_linux_mips.go b/src/syscall/zsyscall_linux_mips.go
index 966b2e1f2c2..c6f4878ff7b 100644
--- a/src/syscall/zsyscall_linux_mips.go
+++ b/src/syscall/zsyscall_linux_mips.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build linux && mips
-// +build linux,mips
package syscall
diff --git a/src/syscall/zsyscall_linux_mips64.go b/src/syscall/zsyscall_linux_mips64.go
index c6812a05152..5187c28ebb6 100644
--- a/src/syscall/zsyscall_linux_mips64.go
+++ b/src/syscall/zsyscall_linux_mips64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build linux && mips64
-// +build linux,mips64
package syscall
diff --git a/src/syscall/zsyscall_linux_mips64le.go b/src/syscall/zsyscall_linux_mips64le.go
index eaaf7dfb41d..f3dacfeedaf 100644
--- a/src/syscall/zsyscall_linux_mips64le.go
+++ b/src/syscall/zsyscall_linux_mips64le.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build linux && mips64le
-// +build linux,mips64le
package syscall
diff --git a/src/syscall/zsyscall_linux_mipsle.go b/src/syscall/zsyscall_linux_mipsle.go
index bb159f1fe7b..fbc543709fc 100644
--- a/src/syscall/zsyscall_linux_mipsle.go
+++ b/src/syscall/zsyscall_linux_mipsle.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build linux && mipsle
-// +build linux,mipsle
package syscall
diff --git a/src/syscall/zsyscall_linux_ppc64.go b/src/syscall/zsyscall_linux_ppc64.go
index 8a4328560a5..b71dca2b371 100644
--- a/src/syscall/zsyscall_linux_ppc64.go
+++ b/src/syscall/zsyscall_linux_ppc64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build linux && ppc64
-// +build linux,ppc64
package syscall
diff --git a/src/syscall/zsyscall_linux_ppc64le.go b/src/syscall/zsyscall_linux_ppc64le.go
index 274b55ce6b9..193fbbc5418 100644
--- a/src/syscall/zsyscall_linux_ppc64le.go
+++ b/src/syscall/zsyscall_linux_ppc64le.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build linux && ppc64le
-// +build linux,ppc64le
package syscall
diff --git a/src/syscall/zsyscall_linux_riscv64.go b/src/syscall/zsyscall_linux_riscv64.go
index e21dc46f32c..33b1e9b4312 100644
--- a/src/syscall/zsyscall_linux_riscv64.go
+++ b/src/syscall/zsyscall_linux_riscv64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build linux && riscv64
-// +build linux,riscv64
package syscall
diff --git a/src/syscall/zsyscall_linux_s390x.go b/src/syscall/zsyscall_linux_s390x.go
index fc667e7c3fa..2ab78c71bfe 100644
--- a/src/syscall/zsyscall_linux_s390x.go
+++ b/src/syscall/zsyscall_linux_s390x.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build linux && s390x
-// +build linux,s390x
package syscall
diff --git a/src/syscall/zsyscall_netbsd_386.go b/src/syscall/zsyscall_netbsd_386.go
index 07ff5fba5f6..408318181af 100644
--- a/src/syscall/zsyscall_netbsd_386.go
+++ b/src/syscall/zsyscall_netbsd_386.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build netbsd && 386
-// +build netbsd,386
package syscall
diff --git a/src/syscall/zsyscall_netbsd_amd64.go b/src/syscall/zsyscall_netbsd_amd64.go
index ffb4e059a4b..2039cf6d0ea 100644
--- a/src/syscall/zsyscall_netbsd_amd64.go
+++ b/src/syscall/zsyscall_netbsd_amd64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build netbsd && amd64
-// +build netbsd,amd64
package syscall
diff --git a/src/syscall/zsyscall_netbsd_arm.go b/src/syscall/zsyscall_netbsd_arm.go
index 37df77e5e8c..3c287ea223d 100644
--- a/src/syscall/zsyscall_netbsd_arm.go
+++ b/src/syscall/zsyscall_netbsd_arm.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build netbsd && arm
-// +build netbsd,arm
package syscall
diff --git a/src/syscall/zsyscall_netbsd_arm64.go b/src/syscall/zsyscall_netbsd_arm64.go
index c5eb57a2269..1d40db9e6b6 100644
--- a/src/syscall/zsyscall_netbsd_arm64.go
+++ b/src/syscall/zsyscall_netbsd_arm64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build netbsd && arm64
-// +build netbsd,arm64
package syscall
diff --git a/src/syscall/zsyscall_openbsd_386.go b/src/syscall/zsyscall_openbsd_386.go
index 1ff5c95fa19..5f95d7a9c6d 100644
--- a/src/syscall/zsyscall_openbsd_386.go
+++ b/src/syscall/zsyscall_openbsd_386.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build openbsd && 386
-// +build openbsd,386
package syscall
diff --git a/src/syscall/zsyscall_openbsd_amd64.go b/src/syscall/zsyscall_openbsd_amd64.go
index 85cb195739f..189bf887e62 100644
--- a/src/syscall/zsyscall_openbsd_amd64.go
+++ b/src/syscall/zsyscall_openbsd_amd64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build openbsd && amd64
-// +build openbsd,amd64
package syscall
diff --git a/src/syscall/zsyscall_openbsd_arm.go b/src/syscall/zsyscall_openbsd_arm.go
index 04a2fadccdd..c7513a3ac9a 100644
--- a/src/syscall/zsyscall_openbsd_arm.go
+++ b/src/syscall/zsyscall_openbsd_arm.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build openbsd && arm
-// +build openbsd,arm
package syscall
diff --git a/src/syscall/zsyscall_openbsd_arm64.go b/src/syscall/zsyscall_openbsd_arm64.go
index fa35905d1bc..293b7036002 100644
--- a/src/syscall/zsyscall_openbsd_arm64.go
+++ b/src/syscall/zsyscall_openbsd_arm64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build openbsd && arm64
-// +build openbsd,arm64
package syscall
diff --git a/src/syscall/zsyscall_openbsd_mips64.go b/src/syscall/zsyscall_openbsd_mips64.go
index 70fd1474fd3..51904b5e29d 100644
--- a/src/syscall/zsyscall_openbsd_mips64.go
+++ b/src/syscall/zsyscall_openbsd_mips64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build openbsd && mips64
-// +build openbsd,mips64
package syscall
diff --git a/src/syscall/zsyscall_plan9_386.go b/src/syscall/zsyscall_plan9_386.go
index 8b7727b3435..32fa0f0eb6e 100644
--- a/src/syscall/zsyscall_plan9_386.go
+++ b/src/syscall/zsyscall_plan9_386.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build plan9 && 386
-// +build plan9,386
package syscall
diff --git a/src/syscall/zsyscall_plan9_amd64.go b/src/syscall/zsyscall_plan9_amd64.go
index bed9108ea6e..b3337ce8110 100644
--- a/src/syscall/zsyscall_plan9_amd64.go
+++ b/src/syscall/zsyscall_plan9_amd64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build plan9 && amd64
-// +build plan9,amd64
package syscall
diff --git a/src/syscall/zsyscall_plan9_arm.go b/src/syscall/zsyscall_plan9_arm.go
index 7bbcf9b4b79..3705566fa3a 100644
--- a/src/syscall/zsyscall_plan9_arm.go
+++ b/src/syscall/zsyscall_plan9_arm.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build plan9 && arm
-// +build plan9,arm
package syscall
diff --git a/src/syscall/zsyscall_solaris_amd64.go b/src/syscall/zsyscall_solaris_amd64.go
index 9b37dc09506..2d8cdfd280b 100644
--- a/src/syscall/zsyscall_solaris_amd64.go
+++ b/src/syscall/zsyscall_solaris_amd64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build solaris && amd64
-// +build solaris,amd64
package syscall
diff --git a/src/syscall/zsysnum_darwin_amd64.go b/src/syscall/zsysnum_darwin_amd64.go
index f66f7d2715f..08e003f2926 100644
--- a/src/syscall/zsysnum_darwin_amd64.go
+++ b/src/syscall/zsysnum_darwin_amd64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build amd64 && darwin
-// +build amd64,darwin
package syscall
diff --git a/src/syscall/zsysnum_darwin_arm64.go b/src/syscall/zsysnum_darwin_arm64.go
index 6fa146368af..71309bb4d6f 100644
--- a/src/syscall/zsysnum_darwin_arm64.go
+++ b/src/syscall/zsysnum_darwin_arm64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build arm64 && darwin
-// +build arm64,darwin
package syscall
diff --git a/src/syscall/zsysnum_dragonfly_amd64.go b/src/syscall/zsysnum_dragonfly_amd64.go
index e8996db0f8d..03d4b06a09b 100644
--- a/src/syscall/zsysnum_dragonfly_amd64.go
+++ b/src/syscall/zsysnum_dragonfly_amd64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build amd64 && dragonfly
-// +build amd64,dragonfly
package syscall
diff --git a/src/syscall/zsysnum_freebsd_386.go b/src/syscall/zsysnum_freebsd_386.go
index 1ed7e3ee8d3..355b2ec3039 100644
--- a/src/syscall/zsysnum_freebsd_386.go
+++ b/src/syscall/zsysnum_freebsd_386.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build 386 && freebsd
-// +build 386,freebsd
package syscall
diff --git a/src/syscall/zsysnum_freebsd_amd64.go b/src/syscall/zsysnum_freebsd_amd64.go
index d72dbc944a1..84c821c955f 100644
--- a/src/syscall/zsysnum_freebsd_amd64.go
+++ b/src/syscall/zsysnum_freebsd_amd64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build amd64 && freebsd
-// +build amd64,freebsd
package syscall
diff --git a/src/syscall/zsysnum_freebsd_arm.go b/src/syscall/zsysnum_freebsd_arm.go
index 4f4dc4db795..785e7875f40 100644
--- a/src/syscall/zsysnum_freebsd_arm.go
+++ b/src/syscall/zsysnum_freebsd_arm.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build arm && freebsd
-// +build arm,freebsd
package syscall
diff --git a/src/syscall/zsysnum_freebsd_arm64.go b/src/syscall/zsysnum_freebsd_arm64.go
index ab1a05258e7..7144a8abed1 100644
--- a/src/syscall/zsysnum_freebsd_arm64.go
+++ b/src/syscall/zsysnum_freebsd_arm64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build arm64 && freebsd
-// +build arm64,freebsd
package syscall
diff --git a/src/syscall/zsysnum_linux_386.go b/src/syscall/zsysnum_linux_386.go
index 792f43550e9..4966d2a9471 100644
--- a/src/syscall/zsysnum_linux_386.go
+++ b/src/syscall/zsysnum_linux_386.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build 386 && linux
-// +build 386,linux
package syscall
diff --git a/src/syscall/zsysnum_linux_amd64.go b/src/syscall/zsysnum_linux_amd64.go
index 9ea18d61113..576c7c36a6b 100644
--- a/src/syscall/zsysnum_linux_amd64.go
+++ b/src/syscall/zsysnum_linux_amd64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build amd64 && linux
-// +build amd64,linux
package syscall
diff --git a/src/syscall/zsysnum_linux_arm.go b/src/syscall/zsysnum_linux_arm.go
index ccae9c15e32..b0da97c64bc 100644
--- a/src/syscall/zsysnum_linux_arm.go
+++ b/src/syscall/zsysnum_linux_arm.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build arm && linux
-// +build arm,linux
package syscall
diff --git a/src/syscall/zsysnum_linux_arm64.go b/src/syscall/zsysnum_linux_arm64.go
index 17c54a2c833..0136d9440b8 100644
--- a/src/syscall/zsysnum_linux_arm64.go
+++ b/src/syscall/zsysnum_linux_arm64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build arm64 && linux
-// +build arm64,linux
package syscall
diff --git a/src/syscall/zsysnum_linux_ppc64.go b/src/syscall/zsysnum_linux_ppc64.go
index a0d37ff1f27..cc964c23e2e 100644
--- a/src/syscall/zsysnum_linux_ppc64.go
+++ b/src/syscall/zsysnum_linux_ppc64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build ppc64 && linux
-// +build ppc64,linux
package syscall
diff --git a/src/syscall/zsysnum_linux_ppc64le.go b/src/syscall/zsysnum_linux_ppc64le.go
index f8f82d20432..57bfb7795f2 100644
--- a/src/syscall/zsysnum_linux_ppc64le.go
+++ b/src/syscall/zsysnum_linux_ppc64le.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build ppc64le && linux
-// +build ppc64le,linux
package syscall
diff --git a/src/syscall/zsysnum_netbsd_386.go b/src/syscall/zsysnum_netbsd_386.go
index fd0c3299514..5696c4befeb 100644
--- a/src/syscall/zsysnum_netbsd_386.go
+++ b/src/syscall/zsysnum_netbsd_386.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build 386 && netbsd
-// +build 386,netbsd
package syscall
diff --git a/src/syscall/zsysnum_netbsd_amd64.go b/src/syscall/zsysnum_netbsd_amd64.go
index 03f2cd3bd32..9fb85cddbaf 100644
--- a/src/syscall/zsysnum_netbsd_amd64.go
+++ b/src/syscall/zsysnum_netbsd_amd64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build amd64 && netbsd
-// +build amd64,netbsd
package syscall
diff --git a/src/syscall/zsysnum_netbsd_arm.go b/src/syscall/zsysnum_netbsd_arm.go
index 7b356e7102c..e0e8994641a 100644
--- a/src/syscall/zsysnum_netbsd_arm.go
+++ b/src/syscall/zsysnum_netbsd_arm.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build arm && netbsd
-// +build arm,netbsd
package syscall
diff --git a/src/syscall/zsysnum_netbsd_arm64.go b/src/syscall/zsysnum_netbsd_arm64.go
index 3f57ec4d894..9653364dae9 100644
--- a/src/syscall/zsysnum_netbsd_arm64.go
+++ b/src/syscall/zsysnum_netbsd_arm64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build arm64 && netbsd
-// +build arm64,netbsd
package syscall
diff --git a/src/syscall/zsysnum_openbsd_386.go b/src/syscall/zsysnum_openbsd_386.go
index b289886d6c6..3b12639bd73 100644
--- a/src/syscall/zsysnum_openbsd_386.go
+++ b/src/syscall/zsysnum_openbsd_386.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build 386 && openbsd
-// +build 386,openbsd
package syscall
diff --git a/src/syscall/zsysnum_openbsd_amd64.go b/src/syscall/zsysnum_openbsd_amd64.go
index 8cf2b68dcd3..bce309dc5d9 100644
--- a/src/syscall/zsysnum_openbsd_amd64.go
+++ b/src/syscall/zsysnum_openbsd_amd64.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build amd64 && openbsd
-// +build amd64,openbsd
package syscall
diff --git a/src/syscall/zsysnum_openbsd_arm.go b/src/syscall/zsysnum_openbsd_arm.go
index cc33773a058..05aed70762d 100644
--- a/src/syscall/zsysnum_openbsd_arm.go
+++ b/src/syscall/zsysnum_openbsd_arm.go
@@ -2,7 +2,6 @@
// Code generated by the command above; DO NOT EDIT.
//go:build arm && openbsd
-// +build arm,openbsd
package syscall
diff --git a/src/syscall/zsysnum_solaris_amd64.go b/src/syscall/zsysnum_solaris_amd64.go
index 23c9c715b52..ea244e535ec 100644
--- a/src/syscall/zsysnum_solaris_amd64.go
+++ b/src/syscall/zsysnum_solaris_amd64.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build amd64 && solaris
-// +build amd64,solaris
package syscall
diff --git a/src/syscall/ztypes_darwin_amd64.go b/src/syscall/ztypes_darwin_amd64.go
index 8feacc47ab5..551edc70257 100644
--- a/src/syscall/ztypes_darwin_amd64.go
+++ b/src/syscall/ztypes_darwin_amd64.go
@@ -2,7 +2,6 @@
// cgo -godefs types_darwin.go
//go:build amd64 && darwin
-// +build amd64,darwin
package syscall
diff --git a/src/syscall/ztypes_darwin_arm64.go b/src/syscall/ztypes_darwin_arm64.go
index 8079d22429b..46f78a97eb2 100644
--- a/src/syscall/ztypes_darwin_arm64.go
+++ b/src/syscall/ztypes_darwin_arm64.go
@@ -2,7 +2,6 @@
// cgo -godefs types_darwin.go
//go:build arm64 && darwin
-// +build arm64,darwin
package syscall
diff --git a/src/syscall/ztypes_dragonfly_amd64.go b/src/syscall/ztypes_dragonfly_amd64.go
index a51e0038bb9..ec519b72ec1 100644
--- a/src/syscall/ztypes_dragonfly_amd64.go
+++ b/src/syscall/ztypes_dragonfly_amd64.go
@@ -2,7 +2,6 @@
// cgo -godefs types_dragonfly.go
//go:build amd64 && dragonfly
-// +build amd64,dragonfly
package syscall
diff --git a/src/syscall/ztypes_freebsd_386.go b/src/syscall/ztypes_freebsd_386.go
index 17397268838..e1946dece8d 100644
--- a/src/syscall/ztypes_freebsd_386.go
+++ b/src/syscall/ztypes_freebsd_386.go
@@ -2,7 +2,6 @@
// cgo -godefs types_freebsd.go | go run mkpost.go
//go:build 386 && freebsd
-// +build 386,freebsd
package syscall
diff --git a/src/syscall/ztypes_freebsd_amd64.go b/src/syscall/ztypes_freebsd_amd64.go
index 0457d8e9959..a718345d799 100644
--- a/src/syscall/ztypes_freebsd_amd64.go
+++ b/src/syscall/ztypes_freebsd_amd64.go
@@ -2,7 +2,6 @@
// cgo -godefs types_freebsd.go | go run mkpost.go
//go:build amd64 && freebsd
-// +build amd64,freebsd
package syscall
diff --git a/src/syscall/ztypes_freebsd_arm.go b/src/syscall/ztypes_freebsd_arm.go
index 29c8380d898..9c5a0667132 100644
--- a/src/syscall/ztypes_freebsd_arm.go
+++ b/src/syscall/ztypes_freebsd_arm.go
@@ -2,7 +2,6 @@
// cgo -godefs -- -fsigned-char types_freebsd.go
//go:build arm && freebsd
-// +build arm,freebsd
package syscall
diff --git a/src/syscall/ztypes_freebsd_arm64.go b/src/syscall/ztypes_freebsd_arm64.go
index 6472db00809..3ccd9fc0dd7 100644
--- a/src/syscall/ztypes_freebsd_arm64.go
+++ b/src/syscall/ztypes_freebsd_arm64.go
@@ -2,7 +2,6 @@
// cgo -godefs types_freebsd.go | go run mkpost.go
//go:build arm64 && freebsd
-// +build arm64,freebsd
package syscall
diff --git a/src/syscall/ztypes_linux_386.go b/src/syscall/ztypes_linux_386.go
index 251a0c0b4ad..a45511e8476 100644
--- a/src/syscall/ztypes_linux_386.go
+++ b/src/syscall/ztypes_linux_386.go
@@ -2,7 +2,6 @@
// cgo -godefs types_linux.go
//go:build 386 && linux
-// +build 386,linux
package syscall
diff --git a/src/syscall/ztypes_linux_amd64.go b/src/syscall/ztypes_linux_amd64.go
index 34c953fc8bf..1bab13bf431 100644
--- a/src/syscall/ztypes_linux_amd64.go
+++ b/src/syscall/ztypes_linux_amd64.go
@@ -2,7 +2,6 @@
// cgo -godefs types_linux.go
//go:build amd64 && linux
-// +build amd64,linux
package syscall
diff --git a/src/syscall/ztypes_linux_arm.go b/src/syscall/ztypes_linux_arm.go
index 4de656b491e..a4d61bd19bb 100644
--- a/src/syscall/ztypes_linux_arm.go
+++ b/src/syscall/ztypes_linux_arm.go
@@ -2,7 +2,6 @@
// cgo -godefs types_linux.go
//go:build arm && linux
-// +build arm,linux
package syscall
diff --git a/src/syscall/ztypes_linux_arm64.go b/src/syscall/ztypes_linux_arm64.go
index bed9cb08515..1e469c36d2e 100644
--- a/src/syscall/ztypes_linux_arm64.go
+++ b/src/syscall/ztypes_linux_arm64.go
@@ -2,7 +2,6 @@
// cgo -godefs -- -fsigned-char types_linux.go
//go:build arm64 && linux
-// +build arm64,linux
package syscall
diff --git a/src/syscall/ztypes_linux_ppc64.go b/src/syscall/ztypes_linux_ppc64.go
index 355533fb27c..c830cee966b 100644
--- a/src/syscall/ztypes_linux_ppc64.go
+++ b/src/syscall/ztypes_linux_ppc64.go
@@ -2,7 +2,6 @@
// cgo -godefs types_linux.go
//go:build ppc64 && linux
-// +build ppc64,linux
package syscall
diff --git a/src/syscall/ztypes_linux_ppc64le.go b/src/syscall/ztypes_linux_ppc64le.go
index 94e12c742c8..770ddc9fe9a 100644
--- a/src/syscall/ztypes_linux_ppc64le.go
+++ b/src/syscall/ztypes_linux_ppc64le.go
@@ -2,7 +2,6 @@
// cgo -godefs types_linux.go
//go:build ppc64le && linux
-// +build ppc64le,linux
package syscall
diff --git a/src/syscall/ztypes_netbsd_386.go b/src/syscall/ztypes_netbsd_386.go
index 321460f45aa..74eaa4a1503 100644
--- a/src/syscall/ztypes_netbsd_386.go
+++ b/src/syscall/ztypes_netbsd_386.go
@@ -2,7 +2,6 @@
// cgo -godefs types_netbsd.go
//go:build 386 && netbsd
-// +build 386,netbsd
package syscall
diff --git a/src/syscall/ztypes_netbsd_amd64.go b/src/syscall/ztypes_netbsd_amd64.go
index 370d7172634..fc28fc9bb8f 100644
--- a/src/syscall/ztypes_netbsd_amd64.go
+++ b/src/syscall/ztypes_netbsd_amd64.go
@@ -2,7 +2,6 @@
// cgo -godefs types_netbsd.go
//go:build amd64 && netbsd
-// +build amd64,netbsd
package syscall
diff --git a/src/syscall/ztypes_netbsd_arm.go b/src/syscall/ztypes_netbsd_arm.go
index 557c6345339..1f885048dd6 100644
--- a/src/syscall/ztypes_netbsd_arm.go
+++ b/src/syscall/ztypes_netbsd_arm.go
@@ -2,7 +2,6 @@
// cgo -godefs types_netbsd.go
//go:build arm && netbsd
-// +build arm,netbsd
package syscall
diff --git a/src/syscall/ztypes_netbsd_arm64.go b/src/syscall/ztypes_netbsd_arm64.go
index 19f36903412..cac74693d75 100644
--- a/src/syscall/ztypes_netbsd_arm64.go
+++ b/src/syscall/ztypes_netbsd_arm64.go
@@ -2,7 +2,6 @@
// cgo -godefs types_netbsd.go
//go:build arm64 && netbsd
-// +build arm64,netbsd
package syscall
diff --git a/src/syscall/ztypes_openbsd_386.go b/src/syscall/ztypes_openbsd_386.go
index 222c6c7e465..f9ba685e252 100644
--- a/src/syscall/ztypes_openbsd_386.go
+++ b/src/syscall/ztypes_openbsd_386.go
@@ -2,7 +2,6 @@
// cgo -godefs types_openbsd.go
//go:build 386 && openbsd
-// +build 386,openbsd
package syscall
diff --git a/src/syscall/ztypes_openbsd_amd64.go b/src/syscall/ztypes_openbsd_amd64.go
index 644ee9b3dfb..889b9551ae9 100644
--- a/src/syscall/ztypes_openbsd_amd64.go
+++ b/src/syscall/ztypes_openbsd_amd64.go
@@ -2,7 +2,6 @@
// cgo -godefs types_openbsd.go
//go:build amd64 && openbsd
-// +build amd64,openbsd
package syscall
diff --git a/src/syscall/ztypes_solaris_amd64.go b/src/syscall/ztypes_solaris_amd64.go
index 64e16b49435..d486cd002f9 100644
--- a/src/syscall/ztypes_solaris_amd64.go
+++ b/src/syscall/ztypes_solaris_amd64.go
@@ -2,7 +2,6 @@
// cgo -godefs types_solaris.go
//go:build amd64 && solaris
-// +build amd64,solaris
package syscall
diff --git a/src/testing/run_example.go b/src/testing/run_example.go
index d9e342d4951..e7eab1e50ef 100644
--- a/src/testing/run_example.go
+++ b/src/testing/run_example.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build !js
-// +build !js
// TODO(@musiol, @odeke-em): re-unify this entire file back into
// example.go when js/wasm gets an os.Pipe implementation
diff --git a/src/testing/run_example_js.go b/src/testing/run_example_js.go
index d914633ba91..adef9511fb5 100644
--- a/src/testing/run_example_js.go
+++ b/src/testing/run_example_js.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js
-// +build js
package testing
diff --git a/src/time/embed.go b/src/time/embed.go
index 34490c859dd..2a9821baa91 100644
--- a/src/time/embed.go
+++ b/src/time/embed.go
@@ -6,7 +6,6 @@
// the binary.
//go:build timetzdata
-// +build timetzdata
package time
diff --git a/src/time/genzabbrs.go b/src/time/genzabbrs.go
index 9fd2f2b7626..a8651bfdb87 100644
--- a/src/time/genzabbrs.go
+++ b/src/time/genzabbrs.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
//
// usage:
diff --git a/src/time/sys_plan9.go b/src/time/sys_plan9.go
index 4dc55e44aa5..ba37cf54244 100644
--- a/src/time/sys_plan9.go
+++ b/src/time/sys_plan9.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build plan9
-// +build plan9
package time
diff --git a/src/time/sys_unix.go b/src/time/sys_unix.go
index 60fc090dc96..a949a6af225 100644
--- a/src/time/sys_unix.go
+++ b/src/time/sys_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd js,wasm linux netbsd openbsd solaris
package time
diff --git a/src/time/tzdata/generate_zipdata.go b/src/time/tzdata/generate_zipdata.go
index 0869c8458c6..4f40b51c736 100644
--- a/src/time/tzdata/generate_zipdata.go
+++ b/src/time/tzdata/generate_zipdata.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ignore
-// +build ignore
// This program generates zipdata.go from $GOROOT/lib/time/zoneinfo.zip.
package main
diff --git a/src/time/zoneinfo_ios.go b/src/time/zoneinfo_ios.go
index 044691e1305..7eccabf2492 100644
--- a/src/time/zoneinfo_ios.go
+++ b/src/time/zoneinfo_ios.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build ios
-// +build ios
package time
diff --git a/src/time/zoneinfo_js.go b/src/time/zoneinfo_js.go
index 8245614d2e1..d0aefb90889 100644
--- a/src/time/zoneinfo_js.go
+++ b/src/time/zoneinfo_js.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build js && wasm
-// +build js,wasm
package time
diff --git a/src/time/zoneinfo_unix.go b/src/time/zoneinfo_unix.go
index 4ea029dbde9..23f8b3cdb4a 100644
--- a/src/time/zoneinfo_unix.go
+++ b/src/time/zoneinfo_unix.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || (darwin && !ios) || dragonfly || freebsd || (linux && !android) || netbsd || openbsd || solaris
-// +build aix darwin,!ios dragonfly freebsd linux,!android netbsd openbsd solaris
// Parse "zoneinfo" time zone file.
// This is a fairly standard file format used on OS X, Linux, BSD, Sun, and others.
diff --git a/src/time/zoneinfo_unix_test.go b/src/time/zoneinfo_unix_test.go
index b75b374c3d5..de95295cd3f 100644
--- a/src/time/zoneinfo_unix_test.go
+++ b/src/time/zoneinfo_unix_test.go
@@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.
//go:build aix || (darwin && !ios) || dragonfly || freebsd || (linux && !android) || netbsd || openbsd || solaris
-// +build aix darwin,!ios dragonfly freebsd linux,!android netbsd openbsd solaris
package time_test
--
GitLab