From 1bfbee0e20e3039533666df89a91c1876e67605d Mon Sep 17 00:00:00 2001 From: Dmitri Shuralyov Date: Wed, 11 Oct 2023 10:25:48 -0400 Subject: [PATCH] all: update go directive to 1.18 Done with: go get go@1.18 go mod tidy go fix ./... Using go1.21.3. Also update code generators to use only the new go:build lines, not the old +build ones. For golang/go#60268. Change-Id: I6aabc42efb6ab3329981100e1db2263aac5e92a6 Reviewed-on: https://go-review.googlesource.com/c/sys/+/534222 Reviewed-by: Ian Lance Taylor Reviewed-by: Dmitri Shuralyov Auto-Submit: Dmitri Shuralyov LUCI-TryBot-Result: Go LUCI --- cpu/asm_aix_ppc64.s | 1 - cpu/cpu_aix.go | 1 - cpu/cpu_arm64.s | 1 - cpu/cpu_gc_arm64.go | 1 - cpu/cpu_gc_s390x.go | 1 - cpu/cpu_gc_x86.go | 2 -- cpu/cpu_gccgo_arm64.go | 1 - cpu/cpu_gccgo_s390x.go | 1 - cpu/cpu_gccgo_x86.c | 2 -- cpu/cpu_gccgo_x86.go | 2 -- cpu/cpu_linux.go | 1 - cpu/cpu_linux_mips64x.go | 2 -- cpu/cpu_linux_noinit.go | 1 - cpu/cpu_linux_ppc64x.go | 2 -- cpu/cpu_loong64.go | 1 - cpu/cpu_mips64x.go | 1 - cpu/cpu_mipsx.go | 1 - cpu/cpu_other_arm.go | 1 - cpu/cpu_other_arm64.go | 1 - cpu/cpu_other_mips64x.go | 2 -- cpu/cpu_other_ppc64x.go | 3 --- cpu/cpu_other_riscv64.go | 1 - cpu/cpu_ppc64x.go | 1 - cpu/cpu_riscv64.go | 1 - cpu/cpu_s390x.s | 1 - cpu/cpu_wasm.go | 1 - cpu/cpu_x86.go | 1 - cpu/cpu_x86.s | 2 -- cpu/endian_big.go | 1 - cpu/endian_little.go | 1 - cpu/proc_cpuinfo_linux.go | 1 - cpu/runtime_auxv_go121.go | 1 - cpu/runtime_auxv_go121_test.go | 1 - cpu/syscall_aix_gccgo.go | 1 - cpu/syscall_aix_ppc64_gc.go | 1 - execabs/execabs_go118.go | 1 - execabs/execabs_go119.go | 1 - go.mod | 2 +- plan9/mksyscall.go | 11 ++--------- plan9/pwd_go15_plan9.go | 1 - plan9/pwd_plan9.go | 1 - plan9/race.go | 1 - plan9/race0.go | 1 - plan9/str.go | 1 - plan9/syscall.go | 1 - plan9/syscall_test.go | 1 - plan9/zsyscall_plan9_386.go | 1 - plan9/zsyscall_plan9_amd64.go | 1 - plan9/zsyscall_plan9_arm.go | 1 - unix/aliases.go | 2 -- unix/asm_aix_ppc64.s | 1 - unix/asm_bsd_386.s | 2 -- unix/asm_bsd_amd64.s | 2 -- unix/asm_bsd_arm.s | 2 -- unix/asm_bsd_arm64.s | 2 -- unix/asm_bsd_ppc64.s | 2 -- unix/asm_bsd_riscv64.s | 2 -- unix/asm_linux_386.s | 1 - unix/asm_linux_amd64.s | 1 - unix/asm_linux_arm.s | 1 - unix/asm_linux_arm64.s | 3 --- unix/asm_linux_loong64.s | 3 --- unix/asm_linux_mips64x.s | 3 --- unix/asm_linux_mipsx.s | 3 --- unix/asm_linux_ppc64x.s | 3 --- unix/asm_linux_riscv64.s | 2 -- unix/asm_linux_s390x.s | 3 --- unix/asm_openbsd_mips64.s | 1 - unix/asm_solaris_amd64.s | 1 - unix/asm_zos_s390x.s | 3 --- unix/cap_freebsd.go | 1 - unix/constants.go | 1 - unix/creds_test.go | 1 - unix/darwin_amd64_test.go | 1 - unix/darwin_arm64_test.go | 1 - unix/darwin_test.go | 1 - unix/dev_aix_ppc.go | 1 - unix/dev_aix_ppc64.go | 1 - unix/dev_linux_test.go | 1 - unix/dev_zos.go | 1 - unix/dev_zos_test.go | 1 - unix/dirent.go | 1 - unix/dirent_test.go | 1 - unix/dup3_test.go | 1 - unix/endian_big.go | 1 - unix/endian_little.go | 1 - unix/env_unix.go | 1 - unix/epoll_zos.go | 1 - unix/epoll_zos_test.go | 1 - unix/example_exec_test.go | 1 - unix/example_flock_test.go | 1 - unix/example_sysvshm_test.go | 1 - unix/export_mremap_test.go | 1 - unix/fcntl.go | 1 - unix/fcntl_linux_32bit.go | 1 - unix/fdset.go | 1 - unix/fdset_test.go | 1 - unix/fstatfs_zos.go | 1 - unix/fstatfs_zos_test.go | 1 - unix/gccgo.go | 1 - unix/gccgo_c.c | 1 - unix/gccgo_linux_amd64.go | 1 - unix/getdirentries_test.go | 1 - unix/getfsstat_test.go | 1 - unix/ifreq_linux.go | 1 - unix/ifreq_linux_test.go | 1 - unix/internal/mkmerge/mkmerge.go | 11 +++++++++-- unix/internal/mkmerge/mkmerge_test.go | 4 +--- unix/ioctl_signed.go | 1 - unix/ioctl_unsigned.go | 1 - unix/ioctl_zos.go | 1 - unix/linux/mkall.go | 9 +-------- unix/linux/mksysnum.go | 9 +-------- unix/linux/types.go | 1 - unix/mkasm.go | 2 -- unix/mkerrors.sh | 1 - unix/mkpost.go | 4 +--- unix/mksyscall.go | 9 +-------- unix/mksyscall_aix_ppc.go | 9 +-------- unix/mksyscall_aix_ppc64.go | 15 +++------------ unix/mksyscall_solaris.go | 9 +-------- unix/mksysctl_openbsd.go | 9 +-------- unix/mksysnum.go | 9 +-------- unix/mmap_nomremap.go | 1 - unix/mmap_unix_test.go | 1 - unix/mmap_zos_test.go | 1 - unix/mremap.go | 1 - unix/mremap_test.go | 1 - unix/openbsd_test.go | 1 - unix/pagesize_unix.go | 1 - unix/pipe2_test.go | 1 - unix/ptrace_darwin.go | 1 - unix/ptrace_ios.go | 1 - unix/race.go | 1 - unix/race0.go | 1 - unix/readdirent_getdents.go | 1 - unix/readdirent_getdirentries.go | 1 - unix/sendfile_test.go | 1 - unix/sockcmsg_unix.go | 1 - unix/sockcmsg_unix_other.go | 1 - unix/syscall.go | 1 - unix/syscall_aix.go | 1 - unix/syscall_aix_ppc.go | 1 - unix/syscall_aix_ppc64.go | 1 - unix/syscall_aix_test.go | 1 - unix/syscall_bsd.go | 1 - unix/syscall_bsd_test.go | 1 - unix/syscall_darwin_amd64.go | 1 - unix/syscall_darwin_arm64.go | 1 - unix/syscall_darwin_libSystem.go | 1 - unix/syscall_dragonfly_amd64.go | 1 - unix/syscall_freebsd_386.go | 1 - unix/syscall_freebsd_amd64.go | 1 - unix/syscall_freebsd_arm.go | 1 - unix/syscall_freebsd_arm64.go | 1 - unix/syscall_freebsd_riscv64.go | 1 - unix/syscall_freebsd_test.go | 1 - unix/syscall_hurd.go | 1 - unix/syscall_hurd_386.go | 1 - unix/syscall_illumos.go | 1 - unix/syscall_internal_bsd_test.go | 1 - unix/syscall_internal_linux_test.go | 1 - unix/syscall_internal_solaris_test.go | 1 - unix/syscall_linux_386.go | 1 - unix/syscall_linux_alarm.go | 2 -- unix/syscall_linux_amd64.go | 1 - unix/syscall_linux_amd64_gc.go | 1 - unix/syscall_linux_arm.go | 1 - unix/syscall_linux_arm64.go | 1 - unix/syscall_linux_gc.go | 1 - unix/syscall_linux_gc_386.go | 1 - unix/syscall_linux_gc_arm.go | 1 - unix/syscall_linux_gccgo_386.go | 1 - unix/syscall_linux_gccgo_arm.go | 1 - unix/syscall_linux_loong64.go | 1 - unix/syscall_linux_mips64x.go | 2 -- unix/syscall_linux_mipsx.go | 2 -- unix/syscall_linux_ppc.go | 1 - unix/syscall_linux_ppc64x.go | 2 -- unix/syscall_linux_riscv64.go | 1 - unix/syscall_linux_s390x.go | 1 - unix/syscall_linux_sparc64.go | 1 - unix/syscall_linux_test.go | 1 - unix/syscall_netbsd_386.go | 1 - unix/syscall_netbsd_amd64.go | 1 - unix/syscall_netbsd_arm.go | 1 - unix/syscall_netbsd_arm64.go | 1 - unix/syscall_openbsd_386.go | 1 - unix/syscall_openbsd_amd64.go | 1 - unix/syscall_openbsd_arm.go | 1 - unix/syscall_openbsd_arm64.go | 1 - unix/syscall_openbsd_libc.go | 1 - unix/syscall_openbsd_ppc64.go | 1 - unix/syscall_openbsd_riscv64.go | 1 - unix/syscall_solaris_amd64.go | 1 - unix/syscall_solaris_test.go | 1 - unix/syscall_test.go | 1 - unix/syscall_unix.go | 1 - unix/syscall_unix_gc.go | 2 -- unix/syscall_unix_gc_ppc64x.go | 3 --- unix/syscall_unix_test.go | 1 - unix/syscall_zos_s390x.go | 1 - unix/syscall_zos_test.go | 1 - unix/sysvshm_linux.go | 1 - unix/sysvshm_unix.go | 1 - unix/sysvshm_unix_other.go | 1 - unix/sysvshm_unix_test.go | 1 - unix/timestruct.go | 1 - unix/timestruct_test.go | 1 - unix/types_aix.go | 1 - unix/types_darwin.go | 1 - unix/types_dragonfly.go | 1 - unix/types_freebsd.go | 1 - unix/types_netbsd.go | 1 - unix/types_openbsd.go | 1 - unix/types_solaris.go | 1 - unix/xattr_bsd.go | 1 - unix/xattr_test.go | 1 - unix/zerrors_aix_ppc.go | 1 - unix/zerrors_aix_ppc64.go | 1 - unix/zerrors_darwin_amd64.go | 1 - unix/zerrors_darwin_arm64.go | 1 - unix/zerrors_dragonfly_amd64.go | 1 - unix/zerrors_freebsd_386.go | 1 - unix/zerrors_freebsd_amd64.go | 1 - unix/zerrors_freebsd_arm.go | 1 - unix/zerrors_freebsd_arm64.go | 1 - unix/zerrors_freebsd_riscv64.go | 1 - unix/zerrors_linux.go | 1 - unix/zerrors_linux_386.go | 1 - unix/zerrors_linux_amd64.go | 1 - unix/zerrors_linux_arm.go | 1 - unix/zerrors_linux_arm64.go | 1 - unix/zerrors_linux_loong64.go | 1 - unix/zerrors_linux_mips.go | 1 - unix/zerrors_linux_mips64.go | 1 - unix/zerrors_linux_mips64le.go | 1 - unix/zerrors_linux_mipsle.go | 1 - unix/zerrors_linux_ppc.go | 1 - unix/zerrors_linux_ppc64.go | 1 - unix/zerrors_linux_ppc64le.go | 1 - unix/zerrors_linux_riscv64.go | 1 - unix/zerrors_linux_s390x.go | 1 - unix/zerrors_linux_sparc64.go | 1 - unix/zerrors_netbsd_386.go | 1 - unix/zerrors_netbsd_amd64.go | 1 - unix/zerrors_netbsd_arm.go | 1 - unix/zerrors_netbsd_arm64.go | 1 - unix/zerrors_openbsd_386.go | 1 - unix/zerrors_openbsd_amd64.go | 1 - unix/zerrors_openbsd_arm.go | 1 - unix/zerrors_openbsd_arm64.go | 1 - unix/zerrors_openbsd_mips64.go | 1 - unix/zerrors_openbsd_ppc64.go | 1 - unix/zerrors_openbsd_riscv64.go | 1 - unix/zerrors_solaris_amd64.go | 1 - unix/zerrors_zos_s390x.go | 1 - unix/zptrace_armnn_linux.go | 2 -- unix/zptrace_mipsnn_linux.go | 2 -- unix/zptrace_mipsnnle_linux.go | 2 -- unix/zptrace_x86_linux.go | 2 -- unix/zsyscall_aix_ppc.go | 1 - unix/zsyscall_aix_ppc64.go | 1 - unix/zsyscall_aix_ppc64_gc.go | 1 - unix/zsyscall_aix_ppc64_gccgo.go | 1 - unix/zsyscall_darwin_amd64.go | 1 - unix/zsyscall_darwin_arm64.go | 1 - unix/zsyscall_dragonfly_amd64.go | 1 - unix/zsyscall_freebsd_386.go | 1 - unix/zsyscall_freebsd_amd64.go | 1 - unix/zsyscall_freebsd_arm.go | 1 - unix/zsyscall_freebsd_arm64.go | 1 - unix/zsyscall_freebsd_riscv64.go | 1 - unix/zsyscall_illumos_amd64.go | 1 - unix/zsyscall_linux.go | 1 - unix/zsyscall_linux_386.go | 1 - unix/zsyscall_linux_amd64.go | 1 - unix/zsyscall_linux_arm.go | 1 - unix/zsyscall_linux_arm64.go | 1 - unix/zsyscall_linux_loong64.go | 1 - unix/zsyscall_linux_mips.go | 1 - unix/zsyscall_linux_mips64.go | 1 - unix/zsyscall_linux_mips64le.go | 1 - unix/zsyscall_linux_mipsle.go | 1 - unix/zsyscall_linux_ppc.go | 1 - unix/zsyscall_linux_ppc64.go | 1 - unix/zsyscall_linux_ppc64le.go | 1 - unix/zsyscall_linux_riscv64.go | 1 - unix/zsyscall_linux_s390x.go | 1 - unix/zsyscall_linux_sparc64.go | 1 - unix/zsyscall_netbsd_386.go | 1 - unix/zsyscall_netbsd_amd64.go | 1 - unix/zsyscall_netbsd_arm.go | 1 - unix/zsyscall_netbsd_arm64.go | 1 - unix/zsyscall_openbsd_386.go | 1 - unix/zsyscall_openbsd_amd64.go | 1 - unix/zsyscall_openbsd_arm.go | 1 - unix/zsyscall_openbsd_arm64.go | 1 - unix/zsyscall_openbsd_mips64.go | 1 - unix/zsyscall_openbsd_ppc64.go | 1 - unix/zsyscall_openbsd_riscv64.go | 1 - unix/zsyscall_solaris_amd64.go | 1 - unix/zsyscall_zos_s390x.go | 1 - unix/zsysctl_openbsd_386.go | 1 - unix/zsysctl_openbsd_amd64.go | 1 - unix/zsysctl_openbsd_arm.go | 1 - unix/zsysctl_openbsd_arm64.go | 1 - unix/zsysctl_openbsd_mips64.go | 1 - unix/zsysctl_openbsd_ppc64.go | 1 - unix/zsysctl_openbsd_riscv64.go | 1 - unix/zsysnum_darwin_amd64.go | 1 - unix/zsysnum_darwin_arm64.go | 1 - unix/zsysnum_dragonfly_amd64.go | 1 - unix/zsysnum_freebsd_386.go | 1 - unix/zsysnum_freebsd_amd64.go | 1 - unix/zsysnum_freebsd_arm.go | 1 - unix/zsysnum_freebsd_arm64.go | 1 - unix/zsysnum_freebsd_riscv64.go | 1 - unix/zsysnum_linux_386.go | 1 - unix/zsysnum_linux_amd64.go | 1 - unix/zsysnum_linux_arm.go | 1 - unix/zsysnum_linux_arm64.go | 1 - unix/zsysnum_linux_loong64.go | 1 - unix/zsysnum_linux_mips.go | 1 - unix/zsysnum_linux_mips64.go | 1 - unix/zsysnum_linux_mips64le.go | 1 - unix/zsysnum_linux_mipsle.go | 1 - unix/zsysnum_linux_ppc.go | 1 - unix/zsysnum_linux_ppc64.go | 1 - unix/zsysnum_linux_ppc64le.go | 1 - unix/zsysnum_linux_riscv64.go | 1 - unix/zsysnum_linux_s390x.go | 1 - unix/zsysnum_linux_sparc64.go | 1 - unix/zsysnum_netbsd_386.go | 1 - unix/zsysnum_netbsd_amd64.go | 1 - unix/zsysnum_netbsd_arm.go | 1 - unix/zsysnum_netbsd_arm64.go | 1 - unix/zsysnum_openbsd_386.go | 1 - unix/zsysnum_openbsd_amd64.go | 1 - unix/zsysnum_openbsd_arm.go | 1 - unix/zsysnum_openbsd_arm64.go | 1 - unix/zsysnum_openbsd_mips64.go | 1 - unix/zsysnum_openbsd_ppc64.go | 1 - unix/zsysnum_openbsd_riscv64.go | 1 - unix/zsysnum_zos_s390x.go | 1 - unix/ztypes_aix_ppc.go | 1 - unix/ztypes_aix_ppc64.go | 1 - unix/ztypes_darwin_amd64.go | 1 - unix/ztypes_darwin_arm64.go | 1 - unix/ztypes_dragonfly_amd64.go | 1 - unix/ztypes_freebsd_386.go | 1 - unix/ztypes_freebsd_amd64.go | 1 - unix/ztypes_freebsd_arm.go | 1 - unix/ztypes_freebsd_arm64.go | 1 - unix/ztypes_freebsd_riscv64.go | 1 - unix/ztypes_linux.go | 1 - unix/ztypes_linux_386.go | 1 - unix/ztypes_linux_amd64.go | 1 - unix/ztypes_linux_arm.go | 1 - unix/ztypes_linux_arm64.go | 1 - unix/ztypes_linux_loong64.go | 1 - unix/ztypes_linux_mips.go | 1 - unix/ztypes_linux_mips64.go | 1 - unix/ztypes_linux_mips64le.go | 1 - unix/ztypes_linux_mipsle.go | 1 - unix/ztypes_linux_ppc.go | 1 - unix/ztypes_linux_ppc64.go | 1 - unix/ztypes_linux_ppc64le.go | 1 - unix/ztypes_linux_riscv64.go | 1 - unix/ztypes_linux_s390x.go | 1 - unix/ztypes_linux_sparc64.go | 1 - unix/ztypes_netbsd_386.go | 1 - unix/ztypes_netbsd_amd64.go | 1 - unix/ztypes_netbsd_arm.go | 1 - unix/ztypes_netbsd_arm64.go | 1 - unix/ztypes_openbsd_386.go | 1 - unix/ztypes_openbsd_amd64.go | 1 - unix/ztypes_openbsd_arm.go | 1 - unix/ztypes_openbsd_arm64.go | 1 - unix/ztypes_openbsd_mips64.go | 1 - unix/ztypes_openbsd_ppc64.go | 1 - unix/ztypes_openbsd_riscv64.go | 1 - unix/ztypes_solaris_amd64.go | 1 - unix/ztypes_zos_s390x.go | 1 - windows/aliases.go | 1 - windows/empty.s | 1 - windows/eventlog.go | 1 - windows/mksyscall.go | 1 - windows/race.go | 1 - windows/race0.go | 1 - windows/registry/export_test.go | 1 - windows/registry/key.go | 1 - windows/registry/mksyscall.go | 1 - windows/registry/registry_test.go | 1 - windows/registry/syscall.go | 1 - windows/registry/value.go | 1 - windows/service.go | 1 - windows/str.go | 1 - windows/svc/debug/log.go | 1 - windows/svc/debug/service.go | 1 - windows/svc/eventlog/install.go | 1 - windows/svc/eventlog/log.go | 1 - windows/svc/eventlog/log_test.go | 1 - windows/svc/example/beep.go | 1 - windows/svc/example/install.go | 1 - windows/svc/example/main.go | 1 - windows/svc/example/manage.go | 1 - windows/svc/example/service.go | 1 - windows/svc/mgr/config.go | 1 - windows/svc/mgr/mgr.go | 1 - windows/svc/mgr/mgr_test.go | 1 - windows/svc/mgr/recovery.go | 1 - windows/svc/mgr/service.go | 1 - windows/svc/security.go | 1 - windows/svc/service.go | 1 - windows/svc/svc_test.go | 1 - windows/syscall.go | 1 - windows/syscall_test.go | 1 - 418 files changed, 24 insertions(+), 534 deletions(-) diff --git a/cpu/asm_aix_ppc64.s b/cpu/asm_aix_ppc64.s index db9171c2..269e173c 100644 --- a/cpu/asm_aix_ppc64.s +++ b/cpu/asm_aix_ppc64.s @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gc -// +build gc #include "textflag.h" diff --git a/cpu/cpu_aix.go b/cpu/cpu_aix.go index 8aaeef54..9bf0c32e 100644 --- a/cpu/cpu_aix.go +++ b/cpu/cpu_aix.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build aix -// +build aix package cpu diff --git a/cpu/cpu_arm64.s b/cpu/cpu_arm64.s index c61f95a0..fcb9a388 100644 --- a/cpu/cpu_arm64.s +++ b/cpu/cpu_arm64.s @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gc -// +build gc #include "textflag.h" diff --git a/cpu/cpu_gc_arm64.go b/cpu/cpu_gc_arm64.go index ccf542a7..a8acd3e3 100644 --- a/cpu/cpu_gc_arm64.go +++ b/cpu/cpu_gc_arm64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gc -// +build gc package cpu diff --git a/cpu/cpu_gc_s390x.go b/cpu/cpu_gc_s390x.go index 0af2f248..c8ae6ddc 100644 --- a/cpu/cpu_gc_s390x.go +++ b/cpu/cpu_gc_s390x.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gc -// +build gc package cpu diff --git a/cpu/cpu_gc_x86.go b/cpu/cpu_gc_x86.go index fa7cdb9b..910728fb 100644 --- a/cpu/cpu_gc_x86.go +++ b/cpu/cpu_gc_x86.go @@ -3,8 +3,6 @@ // license that can be found in the LICENSE file. //go:build (386 || amd64 || amd64p32) && gc -// +build 386 amd64 amd64p32 -// +build gc package cpu diff --git a/cpu/cpu_gccgo_arm64.go b/cpu/cpu_gccgo_arm64.go index 2aff3189..7f194678 100644 --- a/cpu/cpu_gccgo_arm64.go +++ b/cpu/cpu_gccgo_arm64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gccgo -// +build gccgo package cpu diff --git a/cpu/cpu_gccgo_s390x.go b/cpu/cpu_gccgo_s390x.go index 4bfbda61..9526d2ce 100644 --- a/cpu/cpu_gccgo_s390x.go +++ b/cpu/cpu_gccgo_s390x.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gccgo -// +build gccgo package cpu diff --git a/cpu/cpu_gccgo_x86.c b/cpu/cpu_gccgo_x86.c index 6cc73109..3f73a05d 100644 --- a/cpu/cpu_gccgo_x86.c +++ b/cpu/cpu_gccgo_x86.c @@ -3,8 +3,6 @@ // license that can be found in the LICENSE file. //go:build (386 || amd64 || amd64p32) && gccgo -// +build 386 amd64 amd64p32 -// +build gccgo #include #include diff --git a/cpu/cpu_gccgo_x86.go b/cpu/cpu_gccgo_x86.go index 863d415a..99c60fe9 100644 --- a/cpu/cpu_gccgo_x86.go +++ b/cpu/cpu_gccgo_x86.go @@ -3,8 +3,6 @@ // license that can be found in the LICENSE file. //go:build (386 || amd64 || amd64p32) && gccgo -// +build 386 amd64 amd64p32 -// +build gccgo package cpu diff --git a/cpu/cpu_linux.go b/cpu/cpu_linux.go index 159a686f..743eb543 100644 --- a/cpu/cpu_linux.go +++ b/cpu/cpu_linux.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !386 && !amd64 && !amd64p32 && !arm64 -// +build !386,!amd64,!amd64p32,!arm64 package cpu diff --git a/cpu/cpu_linux_mips64x.go b/cpu/cpu_linux_mips64x.go index 6000db4c..4686c1d5 100644 --- a/cpu/cpu_linux_mips64x.go +++ b/cpu/cpu_linux_mips64x.go @@ -3,8 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux && (mips64 || mips64le) -// +build linux -// +build mips64 mips64le package cpu diff --git a/cpu/cpu_linux_noinit.go b/cpu/cpu_linux_noinit.go index f4992b1a..cd63e733 100644 --- a/cpu/cpu_linux_noinit.go +++ b/cpu/cpu_linux_noinit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux && !arm && !arm64 && !mips64 && !mips64le && !ppc64 && !ppc64le && !s390x -// +build linux,!arm,!arm64,!mips64,!mips64le,!ppc64,!ppc64le,!s390x package cpu diff --git a/cpu/cpu_linux_ppc64x.go b/cpu/cpu_linux_ppc64x.go index 021356d6..197188e6 100644 --- a/cpu/cpu_linux_ppc64x.go +++ b/cpu/cpu_linux_ppc64x.go @@ -3,8 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux && (ppc64 || ppc64le) -// +build linux -// +build ppc64 ppc64le package cpu diff --git a/cpu/cpu_loong64.go b/cpu/cpu_loong64.go index 0f57b05b..55863585 100644 --- a/cpu/cpu_loong64.go +++ b/cpu/cpu_loong64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build loong64 -// +build loong64 package cpu diff --git a/cpu/cpu_mips64x.go b/cpu/cpu_mips64x.go index f4063c66..fedb00cc 100644 --- a/cpu/cpu_mips64x.go +++ b/cpu/cpu_mips64x.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build mips64 || mips64le -// +build mips64 mips64le package cpu diff --git a/cpu/cpu_mipsx.go b/cpu/cpu_mipsx.go index 07c4e36d..ffb4ec7e 100644 --- a/cpu/cpu_mipsx.go +++ b/cpu/cpu_mipsx.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build mips || mipsle -// +build mips mipsle package cpu diff --git a/cpu/cpu_other_arm.go b/cpu/cpu_other_arm.go index d7b4fb4c..e9ecf2a4 100644 --- a/cpu/cpu_other_arm.go +++ b/cpu/cpu_other_arm.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !linux && arm -// +build !linux,arm package cpu diff --git a/cpu/cpu_other_arm64.go b/cpu/cpu_other_arm64.go index f3cde129..5341e7f8 100644 --- a/cpu/cpu_other_arm64.go +++ b/cpu/cpu_other_arm64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !linux && !netbsd && !openbsd && arm64 -// +build !linux,!netbsd,!openbsd,arm64 package cpu diff --git a/cpu/cpu_other_mips64x.go b/cpu/cpu_other_mips64x.go index 0dafe964..5f8f2419 100644 --- a/cpu/cpu_other_mips64x.go +++ b/cpu/cpu_other_mips64x.go @@ -3,8 +3,6 @@ // license that can be found in the LICENSE file. //go:build !linux && (mips64 || mips64le) -// +build !linux -// +build mips64 mips64le package cpu diff --git a/cpu/cpu_other_ppc64x.go b/cpu/cpu_other_ppc64x.go index 060d46b6..89608fba 100644 --- a/cpu/cpu_other_ppc64x.go +++ b/cpu/cpu_other_ppc64x.go @@ -3,9 +3,6 @@ // license that can be found in the LICENSE file. //go:build !aix && !linux && (ppc64 || ppc64le) -// +build !aix -// +build !linux -// +build ppc64 ppc64le package cpu diff --git a/cpu/cpu_other_riscv64.go b/cpu/cpu_other_riscv64.go index dd10eb79..5ab87808 100644 --- a/cpu/cpu_other_riscv64.go +++ b/cpu/cpu_other_riscv64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !linux && riscv64 -// +build !linux,riscv64 package cpu diff --git a/cpu/cpu_ppc64x.go b/cpu/cpu_ppc64x.go index 4e8acd16..c14f12b1 100644 --- a/cpu/cpu_ppc64x.go +++ b/cpu/cpu_ppc64x.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ppc64 || ppc64le -// +build ppc64 ppc64le package cpu diff --git a/cpu/cpu_riscv64.go b/cpu/cpu_riscv64.go index ff7da60e..7f0c79c0 100644 --- a/cpu/cpu_riscv64.go +++ b/cpu/cpu_riscv64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build riscv64 -// +build riscv64 package cpu diff --git a/cpu/cpu_s390x.s b/cpu/cpu_s390x.s index 96f81e20..1fb4b701 100644 --- a/cpu/cpu_s390x.s +++ b/cpu/cpu_s390x.s @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gc -// +build gc #include "textflag.h" diff --git a/cpu/cpu_wasm.go b/cpu/cpu_wasm.go index 7747d888..384787ea 100644 --- a/cpu/cpu_wasm.go +++ b/cpu/cpu_wasm.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build wasm -// +build wasm package cpu diff --git a/cpu/cpu_x86.go b/cpu/cpu_x86.go index 2dcde828..c29f5e4c 100644 --- a/cpu/cpu_x86.go +++ b/cpu/cpu_x86.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build 386 || amd64 || amd64p32 -// +build 386 amd64 amd64p32 package cpu diff --git a/cpu/cpu_x86.s b/cpu/cpu_x86.s index 39acab2f..7d7ba33e 100644 --- a/cpu/cpu_x86.s +++ b/cpu/cpu_x86.s @@ -3,8 +3,6 @@ // license that can be found in the LICENSE file. //go:build (386 || amd64 || amd64p32) && gc -// +build 386 amd64 amd64p32 -// +build gc #include "textflag.h" diff --git a/cpu/endian_big.go b/cpu/endian_big.go index 93ce03a3..7fe04b0a 100644 --- a/cpu/endian_big.go +++ b/cpu/endian_big.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build armbe || arm64be || m68k || mips || mips64 || mips64p32 || ppc || ppc64 || s390 || s390x || shbe || sparc || sparc64 -// +build armbe arm64be m68k mips mips64 mips64p32 ppc ppc64 s390 s390x shbe sparc sparc64 package cpu diff --git a/cpu/endian_little.go b/cpu/endian_little.go index 55db853e..48eccc4c 100644 --- a/cpu/endian_little.go +++ b/cpu/endian_little.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build 386 || amd64 || amd64p32 || alpha || arm || arm64 || loong64 || mipsle || mips64le || mips64p32le || nios2 || ppc64le || riscv || riscv64 || sh || wasm -// +build 386 amd64 amd64p32 alpha arm arm64 loong64 mipsle mips64le mips64p32le nios2 ppc64le riscv riscv64 sh wasm package cpu diff --git a/cpu/proc_cpuinfo_linux.go b/cpu/proc_cpuinfo_linux.go index d87bd6b3..4cd64c70 100644 --- a/cpu/proc_cpuinfo_linux.go +++ b/cpu/proc_cpuinfo_linux.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux && arm64 -// +build linux,arm64 package cpu diff --git a/cpu/runtime_auxv_go121.go b/cpu/runtime_auxv_go121.go index b975ea2a..4c9788ea 100644 --- a/cpu/runtime_auxv_go121.go +++ b/cpu/runtime_auxv_go121.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build go1.21 -// +build go1.21 package cpu diff --git a/cpu/runtime_auxv_go121_test.go b/cpu/runtime_auxv_go121_test.go index ac806b4f..2afe767b 100644 --- a/cpu/runtime_auxv_go121_test.go +++ b/cpu/runtime_auxv_go121_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build go1.21 -// +build go1.21 package cpu diff --git a/cpu/syscall_aix_gccgo.go b/cpu/syscall_aix_gccgo.go index 96134157..1b9ccb09 100644 --- a/cpu/syscall_aix_gccgo.go +++ b/cpu/syscall_aix_gccgo.go @@ -9,7 +9,6 @@ // gccgo's libgo and thus must not used a CGo method. //go:build aix && gccgo -// +build aix,gccgo package cpu diff --git a/cpu/syscall_aix_ppc64_gc.go b/cpu/syscall_aix_ppc64_gc.go index 904be42f..e8b6cdbe 100644 --- a/cpu/syscall_aix_ppc64_gc.go +++ b/cpu/syscall_aix_ppc64_gc.go @@ -7,7 +7,6 @@ // (See golang.org/issue/32102) //go:build aix && ppc64 && gc -// +build aix,ppc64,gc package cpu diff --git a/execabs/execabs_go118.go b/execabs/execabs_go118.go index 2000064a..5627d70e 100644 --- a/execabs/execabs_go118.go +++ b/execabs/execabs_go118.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !go1.19 -// +build !go1.19 package execabs diff --git a/execabs/execabs_go119.go b/execabs/execabs_go119.go index f364b341..d60ab1b4 100644 --- a/execabs/execabs_go119.go +++ b/execabs/execabs_go119.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build go1.19 -// +build go1.19 package execabs diff --git a/go.mod b/go.mod index 29eb4d22..9e1e4d59 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ module golang.org/x/sys -go 1.17 +go 1.18 diff --git a/plan9/mksyscall.go b/plan9/mksyscall.go index d7a481fb..fd04cbb6 100644 --- a/plan9/mksyscall.go +++ b/plan9/mksyscall.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ignore -// +build ignore /* This program reads a file containing function prototypes @@ -55,11 +54,6 @@ func goBuildTags() string { return strings.ReplaceAll(*tags, ",", " && ") } -// buildTags returns build tags in the +build format. -func buildTags() string { - return *tags -} - // Param is function parameter type Param struct { Name string @@ -123,7 +117,7 @@ func main() { } libc := false - if goos == "darwin" && strings.Contains(buildTags(), ",go1.12") { + if goos == "darwin" && strings.Contains(goBuildTags(), " && go1.12") { libc = true } trampolines := map[string]bool{} @@ -383,14 +377,13 @@ func main() { } file.Close() } - fmt.Printf(srcTemplate, cmdLine(), goBuildTags(), plusBuildTags(), text) + fmt.Printf(srcTemplate, cmdLine(), goBuildTags(), text) } const srcTemplate = `// %s // Code generated by the command above; see README.md. DO NOT EDIT. //go:build %s -// +build %s package plan9 diff --git a/plan9/pwd_go15_plan9.go b/plan9/pwd_go15_plan9.go index c9b69937..73687de7 100644 --- a/plan9/pwd_go15_plan9.go +++ b/plan9/pwd_go15_plan9.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build go1.5 -// +build go1.5 package plan9 diff --git a/plan9/pwd_plan9.go b/plan9/pwd_plan9.go index 98bf56b7..fb945821 100644 --- a/plan9/pwd_plan9.go +++ b/plan9/pwd_plan9.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !go1.5 -// +build !go1.5 package plan9 diff --git a/plan9/race.go b/plan9/race.go index 62377d2f..c02d9ed3 100644 --- a/plan9/race.go +++ b/plan9/race.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build plan9 && race -// +build plan9,race package plan9 diff --git a/plan9/race0.go b/plan9/race0.go index f8da3087..7b15e15f 100644 --- a/plan9/race0.go +++ b/plan9/race0.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build plan9 && !race -// +build plan9,!race package plan9 diff --git a/plan9/str.go b/plan9/str.go index 55fa8d02..ba3e8ff8 100644 --- a/plan9/str.go +++ b/plan9/str.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build plan9 -// +build plan9 package plan9 diff --git a/plan9/syscall.go b/plan9/syscall.go index 67e5b011..d631fd66 100644 --- a/plan9/syscall.go +++ b/plan9/syscall.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build plan9 -// +build plan9 // Package plan9 contains an interface to the low-level operating system // primitives. OS details vary depending on the underlying system, and diff --git a/plan9/syscall_test.go b/plan9/syscall_test.go index 50b4f685..d030eb54 100644 --- a/plan9/syscall_test.go +++ b/plan9/syscall_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build plan9 -// +build plan9 package plan9_test diff --git a/plan9/zsyscall_plan9_386.go b/plan9/zsyscall_plan9_386.go index 3f40b9bd..f780d5c8 100644 --- a/plan9/zsyscall_plan9_386.go +++ b/plan9/zsyscall_plan9_386.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build plan9 && 386 -// +build plan9,386 package plan9 diff --git a/plan9/zsyscall_plan9_amd64.go b/plan9/zsyscall_plan9_amd64.go index 0e6a96aa..7de61065 100644 --- a/plan9/zsyscall_plan9_amd64.go +++ b/plan9/zsyscall_plan9_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build plan9 && amd64 -// +build plan9,amd64 package plan9 diff --git a/plan9/zsyscall_plan9_arm.go b/plan9/zsyscall_plan9_arm.go index 244c501b..ea85780f 100644 --- a/plan9/zsyscall_plan9_arm.go +++ b/plan9/zsyscall_plan9_arm.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build plan9 && arm -// +build plan9,arm package plan9 diff --git a/unix/aliases.go b/unix/aliases.go index abc89c10..e7d3df4b 100644 --- a/unix/aliases.go +++ b/unix/aliases.go @@ -3,8 +3,6 @@ // license that can be found in the LICENSE file. //go:build (aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos) && go1.9 -// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos -// +build go1.9 package unix diff --git a/unix/asm_aix_ppc64.s b/unix/asm_aix_ppc64.s index db9171c2..269e173c 100644 --- a/unix/asm_aix_ppc64.s +++ b/unix/asm_aix_ppc64.s @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gc -// +build gc #include "textflag.h" diff --git a/unix/asm_bsd_386.s b/unix/asm_bsd_386.s index e0fcd9b3..a4fcef0e 100644 --- a/unix/asm_bsd_386.s +++ b/unix/asm_bsd_386.s @@ -3,8 +3,6 @@ // license that can be found in the LICENSE file. //go:build (freebsd || netbsd || openbsd) && gc -// +build freebsd netbsd openbsd -// +build gc #include "textflag.h" diff --git a/unix/asm_bsd_amd64.s b/unix/asm_bsd_amd64.s index 2b99c349..1e63615c 100644 --- a/unix/asm_bsd_amd64.s +++ b/unix/asm_bsd_amd64.s @@ -3,8 +3,6 @@ // license that can be found in the LICENSE file. //go:build (darwin || dragonfly || freebsd || netbsd || openbsd) && gc -// +build darwin dragonfly freebsd netbsd openbsd -// +build gc #include "textflag.h" diff --git a/unix/asm_bsd_arm.s b/unix/asm_bsd_arm.s index d702d4ad..6496c310 100644 --- a/unix/asm_bsd_arm.s +++ b/unix/asm_bsd_arm.s @@ -3,8 +3,6 @@ // license that can be found in the LICENSE file. //go:build (freebsd || netbsd || openbsd) && gc -// +build freebsd netbsd openbsd -// +build gc #include "textflag.h" diff --git a/unix/asm_bsd_arm64.s b/unix/asm_bsd_arm64.s index fe36a739..4fd1f54d 100644 --- a/unix/asm_bsd_arm64.s +++ b/unix/asm_bsd_arm64.s @@ -3,8 +3,6 @@ // license that can be found in the LICENSE file. //go:build (darwin || freebsd || netbsd || openbsd) && gc -// +build darwin freebsd netbsd openbsd -// +build gc #include "textflag.h" diff --git a/unix/asm_bsd_ppc64.s b/unix/asm_bsd_ppc64.s index e5b9a848..42f7eb9e 100644 --- a/unix/asm_bsd_ppc64.s +++ b/unix/asm_bsd_ppc64.s @@ -3,8 +3,6 @@ // license that can be found in the LICENSE file. //go:build (darwin || freebsd || netbsd || openbsd) && gc -// +build darwin freebsd netbsd openbsd -// +build gc #include "textflag.h" diff --git a/unix/asm_bsd_riscv64.s b/unix/asm_bsd_riscv64.s index d560019e..f8902667 100644 --- a/unix/asm_bsd_riscv64.s +++ b/unix/asm_bsd_riscv64.s @@ -3,8 +3,6 @@ // license that can be found in the LICENSE file. //go:build (darwin || freebsd || netbsd || openbsd) && gc -// +build darwin freebsd netbsd openbsd -// +build gc #include "textflag.h" diff --git a/unix/asm_linux_386.s b/unix/asm_linux_386.s index 8fd101d0..3b473487 100644 --- a/unix/asm_linux_386.s +++ b/unix/asm_linux_386.s @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gc -// +build gc #include "textflag.h" diff --git a/unix/asm_linux_amd64.s b/unix/asm_linux_amd64.s index 7ed38e43..67e29f31 100644 --- a/unix/asm_linux_amd64.s +++ b/unix/asm_linux_amd64.s @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gc -// +build gc #include "textflag.h" diff --git a/unix/asm_linux_arm.s b/unix/asm_linux_arm.s index 8ef1d514..d6ae269c 100644 --- a/unix/asm_linux_arm.s +++ b/unix/asm_linux_arm.s @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gc -// +build gc #include "textflag.h" diff --git a/unix/asm_linux_arm64.s b/unix/asm_linux_arm64.s index 98ae0276..01e5e253 100644 --- a/unix/asm_linux_arm64.s +++ b/unix/asm_linux_arm64.s @@ -3,9 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux && arm64 && gc -// +build linux -// +build arm64 -// +build gc #include "textflag.h" diff --git a/unix/asm_linux_loong64.s b/unix/asm_linux_loong64.s index 56535728..2abf12f6 100644 --- a/unix/asm_linux_loong64.s +++ b/unix/asm_linux_loong64.s @@ -3,9 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux && loong64 && gc -// +build linux -// +build loong64 -// +build gc #include "textflag.h" diff --git a/unix/asm_linux_mips64x.s b/unix/asm_linux_mips64x.s index 21231d2c..f84bae71 100644 --- a/unix/asm_linux_mips64x.s +++ b/unix/asm_linux_mips64x.s @@ -3,9 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux && (mips64 || mips64le) && gc -// +build linux -// +build mips64 mips64le -// +build gc #include "textflag.h" diff --git a/unix/asm_linux_mipsx.s b/unix/asm_linux_mipsx.s index 6783b26c..f08f6280 100644 --- a/unix/asm_linux_mipsx.s +++ b/unix/asm_linux_mipsx.s @@ -3,9 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux && (mips || mipsle) && gc -// +build linux -// +build mips mipsle -// +build gc #include "textflag.h" diff --git a/unix/asm_linux_ppc64x.s b/unix/asm_linux_ppc64x.s index 19d49893..bdfc024d 100644 --- a/unix/asm_linux_ppc64x.s +++ b/unix/asm_linux_ppc64x.s @@ -3,9 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux && (ppc64 || ppc64le) && gc -// +build linux -// +build ppc64 ppc64le -// +build gc #include "textflag.h" diff --git a/unix/asm_linux_riscv64.s b/unix/asm_linux_riscv64.s index e42eb81d..2e8c9961 100644 --- a/unix/asm_linux_riscv64.s +++ b/unix/asm_linux_riscv64.s @@ -3,8 +3,6 @@ // license that can be found in the LICENSE file. //go:build riscv64 && gc -// +build riscv64 -// +build gc #include "textflag.h" diff --git a/unix/asm_linux_s390x.s b/unix/asm_linux_s390x.s index c46aab33..2c394b11 100644 --- a/unix/asm_linux_s390x.s +++ b/unix/asm_linux_s390x.s @@ -3,9 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux && s390x && gc -// +build linux -// +build s390x -// +build gc #include "textflag.h" diff --git a/unix/asm_openbsd_mips64.s b/unix/asm_openbsd_mips64.s index 5e7a1169..fab586a2 100644 --- a/unix/asm_openbsd_mips64.s +++ b/unix/asm_openbsd_mips64.s @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gc -// +build gc #include "textflag.h" diff --git a/unix/asm_solaris_amd64.s b/unix/asm_solaris_amd64.s index f8c5394c..f949ec54 100644 --- a/unix/asm_solaris_amd64.s +++ b/unix/asm_solaris_amd64.s @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gc -// +build gc #include "textflag.h" diff --git a/unix/asm_zos_s390x.s b/unix/asm_zos_s390x.s index 3b54e185..2f67ba86 100644 --- a/unix/asm_zos_s390x.s +++ b/unix/asm_zos_s390x.s @@ -3,9 +3,6 @@ // license that can be found in the LICENSE file. //go:build zos && s390x && gc -// +build zos -// +build s390x -// +build gc #include "textflag.h" diff --git a/unix/cap_freebsd.go b/unix/cap_freebsd.go index 0b7c6adb..a0865789 100644 --- a/unix/cap_freebsd.go +++ b/unix/cap_freebsd.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build freebsd -// +build freebsd package unix diff --git a/unix/constants.go b/unix/constants.go index 394a3965..6fb7cb77 100644 --- a/unix/constants.go +++ b/unix/constants.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos -// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos package unix diff --git a/unix/creds_test.go b/unix/creds_test.go index 32d251fa..e41aa01a 100644 --- a/unix/creds_test.go +++ b/unix/creds_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux -// +build linux package unix_test diff --git a/unix/darwin_amd64_test.go b/unix/darwin_amd64_test.go index 1b42017e..b547a628 100644 --- a/unix/darwin_amd64_test.go +++ b/unix/darwin_amd64_test.go @@ -2,7 +2,6 @@ // Code generated by the command above; DO NOT EDIT. //go:build darwin && go1.12 -// +build darwin,go1.12 package unix diff --git a/unix/darwin_arm64_test.go b/unix/darwin_arm64_test.go index d168bfc9..b0df8c74 100644 --- a/unix/darwin_arm64_test.go +++ b/unix/darwin_arm64_test.go @@ -2,7 +2,6 @@ // Code generated by the command above; DO NOT EDIT. //go:build darwin && go1.12 -// +build darwin,go1.12 package unix diff --git a/unix/darwin_test.go b/unix/darwin_test.go index ef8af089..6f801f6c 100644 --- a/unix/darwin_test.go +++ b/unix/darwin_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin && go1.12 -// +build darwin,go1.12 package unix diff --git a/unix/dev_aix_ppc.go b/unix/dev_aix_ppc.go index 65a99850..d7851346 100644 --- a/unix/dev_aix_ppc.go +++ b/unix/dev_aix_ppc.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build aix && ppc -// +build aix,ppc // Functions to access/create device major and minor numbers matching the // encoding used by AIX. diff --git a/unix/dev_aix_ppc64.go b/unix/dev_aix_ppc64.go index 8fc08ad0..623a5e69 100644 --- a/unix/dev_aix_ppc64.go +++ b/unix/dev_aix_ppc64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build aix && ppc64 -// +build aix,ppc64 // Functions to access/create device major and minor numbers matching the // encoding used AIX. diff --git a/unix/dev_linux_test.go b/unix/dev_linux_test.go index 2b3a9bd8..bf86fd0e 100644 --- a/unix/dev_linux_test.go +++ b/unix/dev_linux_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build go1.7 -// +build go1.7 package unix_test diff --git a/unix/dev_zos.go b/unix/dev_zos.go index a388e59a..bb6a64fe 100644 --- a/unix/dev_zos.go +++ b/unix/dev_zos.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build zos && s390x -// +build zos,s390x // Functions to access/create device major and minor numbers matching the // encoding used by z/OS. diff --git a/unix/dev_zos_test.go b/unix/dev_zos_test.go index d50eeba0..5fa18e98 100644 --- a/unix/dev_zos_test.go +++ b/unix/dev_zos_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build zos && s390x -// +build zos,s390x package unix_test diff --git a/unix/dirent.go b/unix/dirent.go index 2499f977..1ebf1178 100644 --- a/unix/dirent.go +++ b/unix/dirent.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos -// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos package unix diff --git a/unix/dirent_test.go b/unix/dirent_test.go index df6d422f..c4911366 100644 --- a/unix/dirent_test.go +++ b/unix/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 || zos -// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos package unix_test diff --git a/unix/dup3_test.go b/unix/dup3_test.go index b932b3be..9201e355 100644 --- a/unix/dup3_test.go +++ b/unix/dup3_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build freebsd || linux || netbsd || openbsd -// +build freebsd linux netbsd openbsd package unix_test diff --git a/unix/endian_big.go b/unix/endian_big.go index a5202655..1095fd31 100644 --- a/unix/endian_big.go +++ b/unix/endian_big.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. // //go:build armbe || arm64be || m68k || mips || mips64 || mips64p32 || ppc || ppc64 || s390 || s390x || shbe || sparc || sparc64 -// +build armbe arm64be m68k mips mips64 mips64p32 ppc ppc64 s390 s390x shbe sparc sparc64 package unix diff --git a/unix/endian_little.go b/unix/endian_little.go index b0f2bc4a..b9f0e277 100644 --- a/unix/endian_little.go +++ b/unix/endian_little.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. // //go:build 386 || amd64 || amd64p32 || alpha || arm || arm64 || loong64 || mipsle || mips64le || mips64p32le || nios2 || ppc64le || riscv || riscv64 || sh -// +build 386 amd64 amd64p32 alpha arm arm64 loong64 mipsle mips64le mips64p32le nios2 ppc64le riscv riscv64 sh package unix diff --git a/unix/env_unix.go b/unix/env_unix.go index 29ccc4d1..a96da71f 100644 --- a/unix/env_unix.go +++ b/unix/env_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 || zos -// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos // Unix environment variables. diff --git a/unix/epoll_zos.go b/unix/epoll_zos.go index cedaf7e0..7753fdde 100644 --- a/unix/epoll_zos.go +++ b/unix/epoll_zos.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build zos && s390x -// +build zos,s390x package unix diff --git a/unix/epoll_zos_test.go b/unix/epoll_zos_test.go index 6d7ef6d7..1918604e 100644 --- a/unix/epoll_zos_test.go +++ b/unix/epoll_zos_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build zos && s390x -// +build zos,s390x package unix_test diff --git a/unix/example_exec_test.go b/unix/example_exec_test.go index 4302b09f..660e0f28 100644 --- a/unix/example_exec_test.go +++ b/unix/example_exec_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 unix_test diff --git a/unix/example_flock_test.go b/unix/example_flock_test.go index d2cc500b..20cbe6de 100644 --- a/unix/example_flock_test.go +++ b/unix/example_flock_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 unix_test diff --git a/unix/example_sysvshm_test.go b/unix/example_sysvshm_test.go index 66ef2edf..6d2bee70 100644 --- a/unix/example_sysvshm_test.go +++ b/unix/example_sysvshm_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build (darwin && !ios) || (linux && !android) -// +build darwin,!ios linux,!android package unix_test diff --git a/unix/export_mremap_test.go b/unix/export_mremap_test.go index 1c235c2c..b3ec4d07 100644 --- a/unix/export_mremap_test.go +++ b/unix/export_mremap_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux || netbsd -// +build linux netbsd package unix diff --git a/unix/fcntl.go b/unix/fcntl.go index e9b99125..58c6bfc7 100644 --- a/unix/fcntl.go +++ b/unix/fcntl.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/unix/fcntl_linux_32bit.go b/unix/fcntl_linux_32bit.go index 29d44808..13b4acd5 100644 --- a/unix/fcntl_linux_32bit.go +++ b/unix/fcntl_linux_32bit.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build (linux && 386) || (linux && arm) || (linux && mips) || (linux && mipsle) || (linux && ppc) -// +build linux,386 linux,arm linux,mips linux,mipsle linux,ppc package unix diff --git a/unix/fdset.go b/unix/fdset.go index a8068f94..9e83d18c 100644 --- a/unix/fdset.go +++ b/unix/fdset.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos -// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos package unix diff --git a/unix/fdset_test.go b/unix/fdset_test.go index b10e6c96..26d05c7a 100644 --- a/unix/fdset_test.go +++ b/unix/fdset_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 unix_test diff --git a/unix/fstatfs_zos.go b/unix/fstatfs_zos.go index e377cc9f..c8bde601 100644 --- a/unix/fstatfs_zos.go +++ b/unix/fstatfs_zos.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build zos && s390x -// +build zos,s390x package unix diff --git a/unix/fstatfs_zos_test.go b/unix/fstatfs_zos_test.go index 03899deb..a0eb6164 100644 --- a/unix/fstatfs_zos_test.go +++ b/unix/fstatfs_zos_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build zos && s390x -// +build zos,s390x package unix_test diff --git a/unix/gccgo.go b/unix/gccgo.go index b06f52d7..aca5721d 100644 --- a/unix/gccgo.go +++ b/unix/gccgo.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gccgo && !aix && !hurd -// +build gccgo,!aix,!hurd package unix diff --git a/unix/gccgo_c.c b/unix/gccgo_c.c index f98a1c54..d468b7b4 100644 --- a/unix/gccgo_c.c +++ b/unix/gccgo_c.c @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gccgo && !aix && !hurd -// +build gccgo,!aix,!hurd #include #include diff --git a/unix/gccgo_linux_amd64.go b/unix/gccgo_linux_amd64.go index e60e49a3..972d61bd 100644 --- a/unix/gccgo_linux_amd64.go +++ b/unix/gccgo_linux_amd64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gccgo && linux && amd64 -// +build gccgo,linux,amd64 package unix diff --git a/unix/getdirentries_test.go b/unix/getdirentries_test.go index 023e6a14..ca94a4cf 100644 --- a/unix/getdirentries_test.go +++ b/unix/getdirentries_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin || dragonfly || freebsd || openbsd || netbsd || zos -// +build darwin dragonfly freebsd openbsd netbsd zos package unix_test diff --git a/unix/getfsstat_test.go b/unix/getfsstat_test.go index 3b5f9d15..32e2725b 100644 --- a/unix/getfsstat_test.go +++ b/unix/getfsstat_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 unix_test diff --git a/unix/ifreq_linux.go b/unix/ifreq_linux.go index 15721a51..848840ae 100644 --- a/unix/ifreq_linux.go +++ b/unix/ifreq_linux.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux -// +build linux package unix diff --git a/unix/ifreq_linux_test.go b/unix/ifreq_linux_test.go index b81a8b63..f10040bd 100644 --- a/unix/ifreq_linux_test.go +++ b/unix/ifreq_linux_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux -// +build linux package unix diff --git a/unix/internal/mkmerge/mkmerge.go b/unix/internal/mkmerge/mkmerge.go index bb746269..db8098c7 100644 --- a/unix/internal/mkmerge/mkmerge.go +++ b/unix/internal/mkmerge/mkmerge.go @@ -282,7 +282,15 @@ func getCodeSet(src interface{}) (*codeSet, error) { // Add file level comments cmap := ast.NewCommentMap(fset, f, f.Comments) for _, cGrp := range cmap[f] { - set.add(codeElem{token.COMMENT, cGrp.Text()}) + text := cGrp.Text() + if text == "" && len(cGrp.List) == 1 && strings.HasPrefix(cGrp.List[0].Text, "//go:build ") { + // ast.CommentGroup.Text doesn't include comment directives like "//go:build" + // in the text. So if a comment group has empty text and a single //go:build + // constraint line, make a custom codeElem. This is enough for mkmerge needs. + set.add(codeElem{token.COMMENT, cGrp.List[0].Text[len("//"):] + "\n"}) + continue + } + set.add(codeElem{token.COMMENT, text}) } return set, nil @@ -465,7 +473,6 @@ func merge(mergedFile string, archFiles ...string) error { fmt.Fprintln(buf, "// Code generated by mkmerge; DO NOT EDIT.") fmt.Fprintln(buf) fmt.Fprintf(buf, "//go:build %s\n", goos) - fmt.Fprintf(buf, "// +build %s\n", goos) fmt.Fprintln(buf) buf.Write(mergedSrc) diff --git a/unix/internal/mkmerge/mkmerge_test.go b/unix/internal/mkmerge/mkmerge_test.go index e61d7d47..2566dad9 100644 --- a/unix/internal/mkmerge/mkmerge_test.go +++ b/unix/internal/mkmerge/mkmerge_test.go @@ -100,7 +100,6 @@ func TestMerge(t *testing.T) { // build directives for arch{{.}} //go:build goos && arch{{.}} -// +build goos,arch{{.}} package main @@ -186,7 +185,6 @@ const ( // build directives for arch{{.}} //go:build goos && arch{{.}} -// +build goos,arch{{.}} package main @@ -317,7 +315,7 @@ const ( expectedElems := []codeElem{ {token.COMMENT, "Package comments\n"}, {token.COMMENT, "build directives for archA\n"}, - {token.COMMENT, "+build goos,archA\n"}, + {token.COMMENT, "go:build goos && archA\n"}, {token.CONST, `COMMON_INDEPENDENT = 1234`}, {token.CONST, `UNIQUE_INDEPENDENT_A = "UNIQUE_INDEPENDENT_A"`}, {token.CONST, `COMMON_GROUP = "COMMON_GROUP"`}, diff --git a/unix/ioctl_signed.go b/unix/ioctl_signed.go index 7def9580..5b0759bd 100644 --- a/unix/ioctl_signed.go +++ b/unix/ioctl_signed.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/unix/ioctl_unsigned.go b/unix/ioctl_unsigned.go index 649913d1..20f470b9 100644 --- a/unix/ioctl_unsigned.go +++ b/unix/ioctl_unsigned.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin || dragonfly || freebsd || hurd || linux || netbsd || openbsd -// +build darwin dragonfly freebsd hurd linux netbsd openbsd package unix diff --git a/unix/ioctl_zos.go b/unix/ioctl_zos.go index cdc21bf7..c8b2a750 100644 --- a/unix/ioctl_zos.go +++ b/unix/ioctl_zos.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build zos && s390x -// +build zos,s390x package unix diff --git a/unix/linux/mkall.go b/unix/linux/mkall.go index e032013a..70d8cd8f 100644 --- a/unix/linux/mkall.go +++ b/unix/linux/mkall.go @@ -11,7 +11,6 @@ // go run linux/mkall.go //go:build ignore -// +build ignore package main @@ -629,11 +628,7 @@ func (t *target) matchesMksyscallFile(file string) (bool, error) { s := bufio.NewScanner(f) for s.Scan() { // Keep scanning until a valid constraint is found or we hit EOF. - // - // This only supports single-line constraints such as the //go:build - // convention used in Go 1.17+. Because the old //+build convention - // (which may have multiple lines of build tags) is being deprecated, - // we don't bother looking for multi-line constraints. + // This is sufficient for the single-line //go:build constraints. if expr, err = constraint.Parse(s.Text()); err == nil { found = true break @@ -752,8 +747,6 @@ func generatePtracePair(arch1, arch2, archName string) error { fmt.Fprintf(buf, "// Code generated by linux/mkall.go generatePtracePair(%q, %q). DO NOT EDIT.\n", arch1, arch2) fmt.Fprintf(buf, "\n") fmt.Fprintf(buf, "//go:build linux && (%s || %s)\n", arch1, arch2) - fmt.Fprintf(buf, "// +build linux\n") - fmt.Fprintf(buf, "// +build %s %s\n", arch1, arch2) fmt.Fprintf(buf, "\n") fmt.Fprintf(buf, "package unix\n") fmt.Fprintf(buf, "\n") diff --git a/unix/linux/mksysnum.go b/unix/linux/mksysnum.go index e1712cbe..be425325 100644 --- a/unix/linux/mksysnum.go +++ b/unix/linux/mksysnum.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ignore -// +build ignore package main @@ -32,11 +31,6 @@ func goBuildTags() string { return fmt.Sprintf("%s && %s", goarch, goos) } -// plusBuildTags returns build tags in the +build format. -func plusBuildTags() string { - return fmt.Sprintf("%s,%s", goarch, goos) -} - func format(name string, num int, offset int) (int, string) { if num > 999 { // ignore deprecated syscalls that are no longer implemented @@ -186,14 +180,13 @@ func main() { for _, num := range nums { text.WriteString(num.declaration) } - fmt.Printf(template, cmdLine(), goBuildTags(), plusBuildTags(), text.String()) + fmt.Printf(template, cmdLine(), goBuildTags(), text.String()) } const template = `// %s // Code generated by the command above; see README.md. DO NOT EDIT. //go:build %s -// +build %s package unix diff --git a/unix/linux/types.go b/unix/linux/types.go index f5a6ae9e..dcf69cd0 100644 --- a/unix/linux/types.go +++ b/unix/linux/types.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ignore -// +build ignore /* Input to cgo -godefs. See README.md diff --git a/unix/mkasm.go b/unix/mkasm.go index ade20808..9fd62822 100644 --- a/unix/mkasm.go +++ b/unix/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.go. @@ -82,7 +81,6 @@ const darwinTestTemplate = `// go run mkasm.go %s // Code generated by the command above; DO NOT EDIT. //go:build darwin && go1.12 -// +build darwin,go1.12 package unix diff --git a/unix/mkerrors.sh b/unix/mkerrors.sh index 47fa6a7e..cbe24150 100755 --- a/unix/mkerrors.sh +++ b/unix/mkerrors.sh @@ -663,7 +663,6 @@ echo '// mkerrors.sh' "$@" echo '// Code generated by the command above; see README.md. DO NOT EDIT.' echo echo "//go:build ${GOARCH} && ${GOOS}" -echo "// +build ${GOARCH},${GOOS}" echo go tool cgo -godefs -- "$@" _const.go >_error.out cat _error.out | grep -vf _error.grep | grep -vf _signal.grep diff --git a/unix/mkpost.go b/unix/mkpost.go index 928e2765..5dc2a2b9 100644 --- a/unix/mkpost.go +++ b/unix/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 @@ -218,8 +217,7 @@ func main() { replacement := fmt.Sprintf(`$1 | go run mkpost.go // Code generated by the command above; see README.md. DO NOT EDIT. -//go:build %s && %s -// +build %s,%s`, goarch, goos, goarch, goos) +//go:build %s && %s`, goarch, goos) cgoCommandRegex := regexp.MustCompile(`(cgo -godefs .*)`) b = cgoCommandRegex.ReplaceAll(b, []byte(replacement)) diff --git a/unix/mksyscall.go b/unix/mksyscall.go index ad2879e7..e606c2ac 100644 --- a/unix/mksyscall.go +++ b/unix/mksyscall.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ignore -// +build ignore /* This program reads a file containing function prototypes @@ -58,11 +57,6 @@ func goBuildTags() string { return strings.ReplaceAll(*tags, ",", " && ") } -// plusBuildTags returns build tags in the +build format. -func plusBuildTags() string { - return *tags -} - // Param is function parameter type Param struct { Name string @@ -389,14 +383,13 @@ func main() { } file.Close() } - fmt.Printf(srcTemplate, cmdLine(), goBuildTags(), plusBuildTags(), text) + fmt.Printf(srcTemplate, cmdLine(), goBuildTags(), text) } const srcTemplate = `// %s // Code generated by the command above; see README.md. DO NOT EDIT. //go:build %s -// +build %s package unix diff --git a/unix/mksyscall_aix_ppc.go b/unix/mksyscall_aix_ppc.go index eec7dcd8..8cee4e7e 100644 --- a/unix/mksyscall_aix_ppc.go +++ b/unix/mksyscall_aix_ppc.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ignore -// +build ignore /* This program reads a file containing function prototypes @@ -48,11 +47,6 @@ func goBuildTags() string { return strings.ReplaceAll(*tags, ",", " && ") } -// plusBuildTags returns build tags in the +build format. -func plusBuildTags() string { - return *tags -} - // Param is function parameter type Param struct { Name string @@ -392,14 +386,13 @@ func main() { imp = "import \"golang.org/x/sys/unix\"\n" } - fmt.Printf(srcTemplate, cmdLine(), goBuildTags(), plusBuildTags(), pack, cExtern, imp, text) + fmt.Printf(srcTemplate, cmdLine(), goBuildTags(), pack, cExtern, imp, text) } const srcTemplate = `// %s // Code generated by the command above; see README.md. DO NOT EDIT. //go:build %s -// +build %s package %s diff --git a/unix/mksyscall_aix_ppc64.go b/unix/mksyscall_aix_ppc64.go index a6598ddc..6cb2e642 100644 --- a/unix/mksyscall_aix_ppc64.go +++ b/unix/mksyscall_aix_ppc64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ignore -// +build ignore /* This program reads a file containing function prototypes @@ -88,11 +87,6 @@ func goBuildTags() string { return strings.ReplaceAll(*tags, ",", " && ") } -// plusBuildTags returns build tags in the +build format. -func plusBuildTags() string { - return *tags -} - // Param is function parameter type Param struct { Name string @@ -525,7 +519,7 @@ func main() { // Print zsyscall_aix_ppc64.go err := os.WriteFile("zsyscall_aix_ppc64.go", - []byte(fmt.Sprintf(srcTemplate1, cmdLine(), goBuildTags(), plusBuildTags(), pack, imp, textcommon)), + []byte(fmt.Sprintf(srcTemplate1, cmdLine(), goBuildTags(), pack, imp, textcommon)), 0644) if err != nil { fmt.Fprintf(os.Stderr, err.Error()) @@ -536,7 +530,7 @@ func main() { vardecls := "\t" + strings.Join(vars, ",\n\t") vardecls += " syscallFunc" err = os.WriteFile("zsyscall_aix_ppc64_gc.go", - []byte(fmt.Sprintf(srcTemplate2, cmdLine(), goBuildTags(), plusBuildTags(), pack, imp, dynimports, linknames, vardecls, textgc)), + []byte(fmt.Sprintf(srcTemplate2, cmdLine(), goBuildTags(), pack, imp, dynimports, linknames, vardecls, textgc)), 0644) if err != nil { fmt.Fprintf(os.Stderr, err.Error()) @@ -545,7 +539,7 @@ func main() { // Print zsyscall_aix_ppc64_gccgo.go err = os.WriteFile("zsyscall_aix_ppc64_gccgo.go", - []byte(fmt.Sprintf(srcTemplate3, cmdLine(), goBuildTags(), plusBuildTags(), pack, cExtern, imp, textgccgo)), + []byte(fmt.Sprintf(srcTemplate3, cmdLine(), goBuildTags(), pack, cExtern, imp, textgccgo)), 0644) if err != nil { fmt.Fprintf(os.Stderr, err.Error()) @@ -557,7 +551,6 @@ const srcTemplate1 = `// %s // Code generated by the command above; see README.md. DO NOT EDIT. //go:build %s -// +build %s package %s @@ -574,7 +567,6 @@ const srcTemplate2 = `// %s // Code generated by the command above; see README.md. DO NOT EDIT. //go:build %s && gc -// +build %s,gc package %s @@ -600,7 +592,6 @@ const srcTemplate3 = `// %s // Code generated by the command above; see README.md. DO NOT EDIT. //go:build %s && gccgo -// +build %s,gccgo package %s diff --git a/unix/mksyscall_solaris.go b/unix/mksyscall_solaris.go index ba8e85c1..c633cf08 100644 --- a/unix/mksyscall_solaris.go +++ b/unix/mksyscall_solaris.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ignore -// +build ignore /* This program reads a file containing function prototypes @@ -49,11 +48,6 @@ func goBuildTags() string { return strings.ReplaceAll(*tags, ",", " && ") } -// plusBuildTags returns build tags in the +build format. -func plusBuildTags() string { - return *tags -} - // Param is function parameter type Param struct { Name string @@ -322,14 +316,13 @@ func main() { vardecls := "\t" + strings.Join(vars, ",\n\t") vardecls += " syscallFunc" - fmt.Printf(srcTemplate, cmdLine(), goBuildTags(), plusBuildTags(), pack, syscallimp, imp, dynimports, linknames, vardecls, text) + fmt.Printf(srcTemplate, cmdLine(), goBuildTags(), pack, syscallimp, imp, dynimports, linknames, vardecls, text) } const srcTemplate = `// %s // Code generated by the command above; see README.md. DO NOT EDIT. //go:build %s -// +build %s package %s diff --git a/unix/mksysctl_openbsd.go b/unix/mksysctl_openbsd.go index 3fde87ec..80f3747e 100644 --- a/unix/mksysctl_openbsd.go +++ b/unix/mksysctl_openbsd.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ignore -// +build ignore // Parse the header files for OpenBSD and generate a Go usable sysctl MIB. // @@ -37,11 +36,6 @@ func goBuildTags() string { return fmt.Sprintf("%s && %s", goarch, goos) } -// plusBuildTags returns build tags in the +build format. -func plusBuildTags() string { - return fmt.Sprintf("%s,%s", goarch, goos) -} - // reMatch performs regular expression match and stores the substring slice to value pointed by m. func reMatch(re *regexp.Regexp, str string, m *[]string) bool { *m = re.FindStringSubmatch(str) @@ -336,14 +330,13 @@ func main() { sort.Strings(sysCtl) text := strings.Join(sysCtl, "") - fmt.Printf(srcTemplate, cmdLine(), goBuildTags(), plusBuildTags(), text) + fmt.Printf(srcTemplate, cmdLine(), goBuildTags(), text) } const srcTemplate = `// %s // Code generated by the command above; DO NOT EDIT. //go:build %s -// +build %s package unix diff --git a/unix/mksysnum.go b/unix/mksysnum.go index 27368041..70fd43c3 100644 --- a/unix/mksysnum.go +++ b/unix/mksysnum.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ignore -// +build ignore // Generate system call table for DragonFly, NetBSD, // FreeBSD or OpenBSD from master list (for example, @@ -34,11 +33,6 @@ func goBuildTags() string { return fmt.Sprintf("%s && %s", goarch, goos) } -// plusBuildTags returns build tags in the +build format. -func plusBuildTags() string { - return fmt.Sprintf("%s,%s", goarch, goos) -} - func checkErr(err error) { if err != nil { fmt.Fprintf(os.Stderr, "%v\n", err) @@ -182,14 +176,13 @@ func main() { err := s.Err() checkErr(err) - fmt.Printf(template, cmdLine(), goBuildTags(), plusBuildTags(), text) + fmt.Printf(template, cmdLine(), goBuildTags(), text) } const template = `// %s // Code generated by the command above; see README.md. DO NOT EDIT. //go:build %s -// +build %s package unix diff --git a/unix/mmap_nomremap.go b/unix/mmap_nomremap.go index ca051363..4b68e597 100644 --- a/unix/mmap_nomremap.go +++ b/unix/mmap_nomremap.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build aix || darwin || dragonfly || freebsd || openbsd || solaris -// +build aix darwin dragonfly freebsd openbsd solaris package unix diff --git a/unix/mmap_unix_test.go b/unix/mmap_unix_test.go index d51f690e..a60a0f62 100644 --- a/unix/mmap_unix_test.go +++ b/unix/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 || solaris -// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris package unix_test diff --git a/unix/mmap_zos_test.go b/unix/mmap_zos_test.go index 513cc553..1dc580ae 100644 --- a/unix/mmap_zos_test.go +++ b/unix/mmap_zos_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build zos && s390x -// +build zos,s390x // This test is based on mmap_unix_test, but tweaked for z/OS, which does not support memadvise // or anonymous mmapping. diff --git a/unix/mremap.go b/unix/mremap.go index fa93d0aa..fd45fe52 100644 --- a/unix/mremap.go +++ b/unix/mremap.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux || netbsd -// +build linux netbsd package unix diff --git a/unix/mremap_test.go b/unix/mremap_test.go index 40d4f60d..e84104fc 100644 --- a/unix/mremap_test.go +++ b/unix/mremap_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux || netbsd -// +build linux netbsd package unix_test diff --git a/unix/openbsd_test.go b/unix/openbsd_test.go index 4955943a..8ca05245 100644 --- a/unix/openbsd_test.go +++ b/unix/openbsd_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build openbsd -// +build openbsd // This, on the face of it, bizarre testing mechanism is necessary because // the only reliable way to gauge whether or not a pledge(2) call has succeeded diff --git a/unix/pagesize_unix.go b/unix/pagesize_unix.go index 53f1b4c5..4d0a3430 100644 --- a/unix/pagesize_unix.go +++ b/unix/pagesize_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 // For Unix, get the pagesize from the runtime. diff --git a/unix/pipe2_test.go b/unix/pipe2_test.go index d2f50a1d..74a43f06 100644 --- a/unix/pipe2_test.go +++ b/unix/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 unix_test diff --git a/unix/ptrace_darwin.go b/unix/ptrace_darwin.go index 463c3eff..3f0975f3 100644 --- a/unix/ptrace_darwin.go +++ b/unix/ptrace_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/unix/ptrace_ios.go b/unix/ptrace_ios.go index ed0509a0..a4d35db5 100644 --- a/unix/ptrace_ios.go +++ b/unix/ptrace_ios.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ios -// +build ios package unix diff --git a/unix/race.go b/unix/race.go index 6f6c5fec..714d2aae 100644 --- a/unix/race.go +++ b/unix/race.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build (darwin && race) || (linux && race) || (freebsd && race) -// +build darwin,race linux,race freebsd,race package unix diff --git a/unix/race0.go b/unix/race0.go index 706e1322..4a9f6634 100644 --- a/unix/race0.go +++ b/unix/race0.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build aix || (darwin && !race) || (linux && !race) || (freebsd && !race) || netbsd || openbsd || solaris || dragonfly || zos -// +build aix darwin,!race linux,!race freebsd,!race netbsd openbsd solaris dragonfly zos package unix diff --git a/unix/readdirent_getdents.go b/unix/readdirent_getdents.go index 4d625756..dbd2b6cc 100644 --- a/unix/readdirent_getdents.go +++ b/unix/readdirent_getdents.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build aix || dragonfly || freebsd || linux || netbsd || openbsd -// +build aix dragonfly freebsd linux netbsd openbsd package unix diff --git a/unix/readdirent_getdirentries.go b/unix/readdirent_getdirentries.go index 2a4ba47c..130398b6 100644 --- a/unix/readdirent_getdirentries.go +++ b/unix/readdirent_getdirentries.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin -// +build darwin package unix diff --git a/unix/sendfile_test.go b/unix/sendfile_test.go index c4494e01..37f7312b 100644 --- a/unix/sendfile_test.go +++ b/unix/sendfile_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build (darwin && amd64) || dragonfly || freebsd || linux || solaris -// +build darwin,amd64 dragonfly freebsd linux solaris package unix_test diff --git a/unix/sockcmsg_unix.go b/unix/sockcmsg_unix.go index 3865943f..c3a62dbb 100644 --- a/unix/sockcmsg_unix.go +++ b/unix/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 || zos -// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos // Socket control messages diff --git a/unix/sockcmsg_unix_other.go b/unix/sockcmsg_unix_other.go index 0840fe4a..4a1eab37 100644 --- a/unix/sockcmsg_unix_other.go +++ b/unix/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 || zos -// +build aix darwin freebsd linux netbsd openbsd solaris zos package unix diff --git a/unix/syscall.go b/unix/syscall.go index 63e8c838..5ea74da9 100644 --- a/unix/syscall.go +++ b/unix/syscall.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos -// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos // Package unix contains an interface to the low-level operating system // primitives. OS details vary depending on the underlying system, and diff --git a/unix/syscall_aix.go b/unix/syscall_aix.go index e94e6cda..6d3009d2 100644 --- a/unix/syscall_aix.go +++ b/unix/syscall_aix.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build aix -// +build aix // Aix system calls. // This file is compiled as ordinary Go code, diff --git a/unix/syscall_aix_ppc.go b/unix/syscall_aix_ppc.go index f2871fa9..1fdaa476 100644 --- a/unix/syscall_aix_ppc.go +++ b/unix/syscall_aix_ppc.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build aix && ppc -// +build aix,ppc package unix diff --git a/unix/syscall_aix_ppc64.go b/unix/syscall_aix_ppc64.go index 75718ec0..c87f9a9f 100644 --- a/unix/syscall_aix_ppc64.go +++ b/unix/syscall_aix_ppc64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build aix && ppc64 -// +build aix,ppc64 package unix diff --git a/unix/syscall_aix_test.go b/unix/syscall_aix_test.go index ffff394c..581936ad 100644 --- a/unix/syscall_aix_test.go +++ b/unix/syscall_aix_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build aix -// +build aix package unix_test diff --git a/unix/syscall_bsd.go b/unix/syscall_bsd.go index 4217de51..6f328e3a 100644 --- a/unix/syscall_bsd.go +++ b/unix/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/unix/syscall_bsd_test.go b/unix/syscall_bsd_test.go index 9646c567..3f3cc98a 100644 --- a/unix/syscall_bsd_test.go +++ b/unix/syscall_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 unix_test diff --git a/unix/syscall_darwin_amd64.go b/unix/syscall_darwin_amd64.go index b37310ce..0eaecf5f 100644 --- a/unix/syscall_darwin_amd64.go +++ b/unix/syscall_darwin_amd64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build amd64 && darwin -// +build amd64,darwin package unix diff --git a/unix/syscall_darwin_arm64.go b/unix/syscall_darwin_arm64.go index d51ec996..f36c6707 100644 --- a/unix/syscall_darwin_arm64.go +++ b/unix/syscall_darwin_arm64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build arm64 && darwin -// +build arm64,darwin package unix diff --git a/unix/syscall_darwin_libSystem.go b/unix/syscall_darwin_libSystem.go index 53c96641..16dc6993 100644 --- a/unix/syscall_darwin_libSystem.go +++ b/unix/syscall_darwin_libSystem.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin && go1.12 -// +build darwin,go1.12 package unix diff --git a/unix/syscall_dragonfly_amd64.go b/unix/syscall_dragonfly_amd64.go index 4e2d3212..14bab6b2 100644 --- a/unix/syscall_dragonfly_amd64.go +++ b/unix/syscall_dragonfly_amd64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build amd64 && dragonfly -// +build amd64,dragonfly package unix diff --git a/unix/syscall_freebsd_386.go b/unix/syscall_freebsd_386.go index b8da5100..3967bca7 100644 --- a/unix/syscall_freebsd_386.go +++ b/unix/syscall_freebsd_386.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build 386 && freebsd -// +build 386,freebsd package unix diff --git a/unix/syscall_freebsd_amd64.go b/unix/syscall_freebsd_amd64.go index 47155c48..eff19ada 100644 --- a/unix/syscall_freebsd_amd64.go +++ b/unix/syscall_freebsd_amd64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build amd64 && freebsd -// +build amd64,freebsd package unix diff --git a/unix/syscall_freebsd_arm.go b/unix/syscall_freebsd_arm.go index 08932093..4f24b517 100644 --- a/unix/syscall_freebsd_arm.go +++ b/unix/syscall_freebsd_arm.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build arm && freebsd -// +build arm,freebsd package unix diff --git a/unix/syscall_freebsd_arm64.go b/unix/syscall_freebsd_arm64.go index d151a0d0..ac30759e 100644 --- a/unix/syscall_freebsd_arm64.go +++ b/unix/syscall_freebsd_arm64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build arm64 && freebsd -// +build arm64,freebsd package unix diff --git a/unix/syscall_freebsd_riscv64.go b/unix/syscall_freebsd_riscv64.go index d5cd64b3..aab725ca 100644 --- a/unix/syscall_freebsd_riscv64.go +++ b/unix/syscall_freebsd_riscv64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build riscv64 && freebsd -// +build riscv64,freebsd package unix diff --git a/unix/syscall_freebsd_test.go b/unix/syscall_freebsd_test.go index e27689ac..cbe3d366 100644 --- a/unix/syscall_freebsd_test.go +++ b/unix/syscall_freebsd_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build freebsd -// +build freebsd package unix_test diff --git a/unix/syscall_hurd.go b/unix/syscall_hurd.go index 381fd467..ba46651f 100644 --- a/unix/syscall_hurd.go +++ b/unix/syscall_hurd.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build hurd -// +build hurd package unix diff --git a/unix/syscall_hurd_386.go b/unix/syscall_hurd_386.go index 7cf54a3e..df89f9e6 100644 --- a/unix/syscall_hurd_386.go +++ b/unix/syscall_hurd_386.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build 386 && hurd -// +build 386,hurd package unix diff --git a/unix/syscall_illumos.go b/unix/syscall_illumos.go index 87db5a6a..a863f705 100644 --- a/unix/syscall_illumos.go +++ b/unix/syscall_illumos.go @@ -5,7 +5,6 @@ // illumos system calls not present on Solaris. //go:build amd64 && illumos -// +build amd64,illumos package unix diff --git a/unix/syscall_internal_bsd_test.go b/unix/syscall_internal_bsd_test.go index e7422670..7d07b5e3 100644 --- a/unix/syscall_internal_bsd_test.go +++ b/unix/syscall_internal_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 unix diff --git a/unix/syscall_internal_linux_test.go b/unix/syscall_internal_linux_test.go index d2aebe37..7d34c4f1 100644 --- a/unix/syscall_internal_linux_test.go +++ b/unix/syscall_internal_linux_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux -// +build linux package unix diff --git a/unix/syscall_internal_solaris_test.go b/unix/syscall_internal_solaris_test.go index d3b58718..b7596575 100644 --- a/unix/syscall_internal_solaris_test.go +++ b/unix/syscall_internal_solaris_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build solaris -// +build solaris package unix diff --git a/unix/syscall_linux_386.go b/unix/syscall_linux_386.go index c7d9945e..506dafa7 100644 --- a/unix/syscall_linux_386.go +++ b/unix/syscall_linux_386.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build 386 && linux -// +build 386,linux package unix diff --git a/unix/syscall_linux_alarm.go b/unix/syscall_linux_alarm.go index 08086ac6..38d55641 100644 --- a/unix/syscall_linux_alarm.go +++ b/unix/syscall_linux_alarm.go @@ -3,8 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux && (386 || amd64 || mips || mipsle || mips64 || mipsle || ppc64 || ppc64le || ppc || s390x || sparc64) -// +build linux -// +build 386 amd64 mips mipsle mips64 mipsle ppc64 ppc64le ppc s390x sparc64 package unix diff --git a/unix/syscall_linux_amd64.go b/unix/syscall_linux_amd64.go index 70601ce3..d557cf8d 100644 --- a/unix/syscall_linux_amd64.go +++ b/unix/syscall_linux_amd64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build amd64 && linux -// +build amd64,linux package unix diff --git a/unix/syscall_linux_amd64_gc.go b/unix/syscall_linux_amd64_gc.go index 8b0f0f3a..facdb83b 100644 --- a/unix/syscall_linux_amd64_gc.go +++ b/unix/syscall_linux_amd64_gc.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build amd64 && linux && gc -// +build amd64,linux,gc package unix diff --git a/unix/syscall_linux_arm.go b/unix/syscall_linux_arm.go index da298641..cd2dd797 100644 --- a/unix/syscall_linux_arm.go +++ b/unix/syscall_linux_arm.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build arm && linux -// +build arm,linux package unix diff --git a/unix/syscall_linux_arm64.go b/unix/syscall_linux_arm64.go index f5266689..cf2ee6c7 100644 --- a/unix/syscall_linux_arm64.go +++ b/unix/syscall_linux_arm64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build arm64 && linux -// +build arm64,linux package unix diff --git a/unix/syscall_linux_gc.go b/unix/syscall_linux_gc.go index 2b1168d7..ffc4c2b6 100644 --- a/unix/syscall_linux_gc.go +++ b/unix/syscall_linux_gc.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux && gc -// +build linux,gc package unix diff --git a/unix/syscall_linux_gc_386.go b/unix/syscall_linux_gc_386.go index 9843fb48..9ebfdcf4 100644 --- a/unix/syscall_linux_gc_386.go +++ b/unix/syscall_linux_gc_386.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux && gc && 386 -// +build linux,gc,386 package unix diff --git a/unix/syscall_linux_gc_arm.go b/unix/syscall_linux_gc_arm.go index a6008fcc..5f2b57c4 100644 --- a/unix/syscall_linux_gc_arm.go +++ b/unix/syscall_linux_gc_arm.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build arm && gc && linux -// +build arm,gc,linux package unix diff --git a/unix/syscall_linux_gccgo_386.go b/unix/syscall_linux_gccgo_386.go index 7740af24..d1a3ad82 100644 --- a/unix/syscall_linux_gccgo_386.go +++ b/unix/syscall_linux_gccgo_386.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux && gccgo && 386 -// +build linux,gccgo,386 package unix diff --git a/unix/syscall_linux_gccgo_arm.go b/unix/syscall_linux_gccgo_arm.go index e16a1229..f2f67423 100644 --- a/unix/syscall_linux_gccgo_arm.go +++ b/unix/syscall_linux_gccgo_arm.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux && gccgo && arm -// +build linux,gccgo,arm package unix diff --git a/unix/syscall_linux_loong64.go b/unix/syscall_linux_loong64.go index f6ab02ec..3d0e9845 100644 --- a/unix/syscall_linux_loong64.go +++ b/unix/syscall_linux_loong64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build loong64 && linux -// +build loong64,linux package unix diff --git a/unix/syscall_linux_mips64x.go b/unix/syscall_linux_mips64x.go index 93fe59d2..70963a95 100644 --- a/unix/syscall_linux_mips64x.go +++ b/unix/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 unix diff --git a/unix/syscall_linux_mipsx.go b/unix/syscall_linux_mipsx.go index aae7f0ff..c218ebd2 100644 --- a/unix/syscall_linux_mipsx.go +++ b/unix/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 unix diff --git a/unix/syscall_linux_ppc.go b/unix/syscall_linux_ppc.go index 66eff19a..e6c48500 100644 --- a/unix/syscall_linux_ppc.go +++ b/unix/syscall_linux_ppc.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux && ppc -// +build linux,ppc package unix diff --git a/unix/syscall_linux_ppc64x.go b/unix/syscall_linux_ppc64x.go index 806aa257..7286a9aa 100644 --- a/unix/syscall_linux_ppc64x.go +++ b/unix/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 unix diff --git a/unix/syscall_linux_riscv64.go b/unix/syscall_linux_riscv64.go index 5e6ceee1..6f5a2889 100644 --- a/unix/syscall_linux_riscv64.go +++ b/unix/syscall_linux_riscv64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build riscv64 && linux -// +build riscv64,linux package unix diff --git a/unix/syscall_linux_s390x.go b/unix/syscall_linux_s390x.go index 2f89e8f5..66f31210 100644 --- a/unix/syscall_linux_s390x.go +++ b/unix/syscall_linux_s390x.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build s390x && linux -// +build s390x,linux package unix diff --git a/unix/syscall_linux_sparc64.go b/unix/syscall_linux_sparc64.go index 7ca064ae..11d1f169 100644 --- a/unix/syscall_linux_sparc64.go +++ b/unix/syscall_linux_sparc64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build sparc64 && linux -// +build sparc64,linux package unix diff --git a/unix/syscall_linux_test.go b/unix/syscall_linux_test.go index 36b1e7f4..2a92419d 100644 --- a/unix/syscall_linux_test.go +++ b/unix/syscall_linux_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux -// +build linux package unix_test diff --git a/unix/syscall_netbsd_386.go b/unix/syscall_netbsd_386.go index 5199d282..7a5eb574 100644 --- a/unix/syscall_netbsd_386.go +++ b/unix/syscall_netbsd_386.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build 386 && netbsd -// +build 386,netbsd package unix diff --git a/unix/syscall_netbsd_amd64.go b/unix/syscall_netbsd_amd64.go index 70a9c52e..62d8957a 100644 --- a/unix/syscall_netbsd_amd64.go +++ b/unix/syscall_netbsd_amd64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build amd64 && netbsd -// +build amd64,netbsd package unix diff --git a/unix/syscall_netbsd_arm.go b/unix/syscall_netbsd_arm.go index 3eb5942f..ce6a0688 100644 --- a/unix/syscall_netbsd_arm.go +++ b/unix/syscall_netbsd_arm.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build arm && netbsd -// +build arm,netbsd package unix diff --git a/unix/syscall_netbsd_arm64.go b/unix/syscall_netbsd_arm64.go index fc6ccfd8..d46d689d 100644 --- a/unix/syscall_netbsd_arm64.go +++ b/unix/syscall_netbsd_arm64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build arm64 && netbsd -// +build arm64,netbsd package unix diff --git a/unix/syscall_openbsd_386.go b/unix/syscall_openbsd_386.go index 6baabcdc..9ddc89f4 100644 --- a/unix/syscall_openbsd_386.go +++ b/unix/syscall_openbsd_386.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build 386 && openbsd -// +build 386,openbsd package unix diff --git a/unix/syscall_openbsd_amd64.go b/unix/syscall_openbsd_amd64.go index bab25360..70a3c96e 100644 --- a/unix/syscall_openbsd_amd64.go +++ b/unix/syscall_openbsd_amd64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build amd64 && openbsd -// +build amd64,openbsd package unix diff --git a/unix/syscall_openbsd_arm.go b/unix/syscall_openbsd_arm.go index 8eed3c4d..265caa87 100644 --- a/unix/syscall_openbsd_arm.go +++ b/unix/syscall_openbsd_arm.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build arm && openbsd -// +build arm,openbsd package unix diff --git a/unix/syscall_openbsd_arm64.go b/unix/syscall_openbsd_arm64.go index 483dde99..ac4fda17 100644 --- a/unix/syscall_openbsd_arm64.go +++ b/unix/syscall_openbsd_arm64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build arm64 && openbsd -// +build arm64,openbsd package unix diff --git a/unix/syscall_openbsd_libc.go b/unix/syscall_openbsd_libc.go index 04aa43f4..0a451e6d 100644 --- a/unix/syscall_openbsd_libc.go +++ b/unix/syscall_openbsd_libc.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build openbsd -// +build openbsd package unix diff --git a/unix/syscall_openbsd_ppc64.go b/unix/syscall_openbsd_ppc64.go index c2796139..30a308cb 100644 --- a/unix/syscall_openbsd_ppc64.go +++ b/unix/syscall_openbsd_ppc64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ppc64 && openbsd -// +build ppc64,openbsd package unix diff --git a/unix/syscall_openbsd_riscv64.go b/unix/syscall_openbsd_riscv64.go index 23199a7f..ea954330 100644 --- a/unix/syscall_openbsd_riscv64.go +++ b/unix/syscall_openbsd_riscv64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build riscv64 && openbsd -// +build riscv64,openbsd package unix diff --git a/unix/syscall_solaris_amd64.go b/unix/syscall_solaris_amd64.go index 0bd25ef8..e02d8cea 100644 --- a/unix/syscall_solaris_amd64.go +++ b/unix/syscall_solaris_amd64.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build amd64 && solaris -// +build amd64,solaris package unix diff --git a/unix/syscall_solaris_test.go b/unix/syscall_solaris_test.go index f99c2a19..a9d486a1 100644 --- a/unix/syscall_solaris_test.go +++ b/unix/syscall_solaris_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build solaris -// +build solaris package unix_test diff --git a/unix/syscall_test.go b/unix/syscall_test.go index bc2a0883..f9c14f76 100644 --- a/unix/syscall_test.go +++ b/unix/syscall_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 unix_test diff --git a/unix/syscall_unix.go b/unix/syscall_unix.go index f6eda270..77081de8 100644 --- a/unix/syscall_unix.go +++ b/unix/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 unix diff --git a/unix/syscall_unix_gc.go b/unix/syscall_unix_gc.go index b6919ca5..05c95bcc 100644 --- a/unix/syscall_unix_gc.go +++ b/unix/syscall_unix_gc.go @@ -3,8 +3,6 @@ // license that can be found in the LICENSE file. //go:build (darwin || dragonfly || freebsd || (linux && !ppc64 && !ppc64le) || netbsd || openbsd || solaris) && gc -// +build darwin dragonfly freebsd linux,!ppc64,!ppc64le netbsd openbsd solaris -// +build gc package unix diff --git a/unix/syscall_unix_gc_ppc64x.go b/unix/syscall_unix_gc_ppc64x.go index f6f707ac..23f39b7a 100644 --- a/unix/syscall_unix_gc_ppc64x.go +++ b/unix/syscall_unix_gc_ppc64x.go @@ -3,9 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux && (ppc64le || ppc64) && gc -// +build linux -// +build ppc64le ppc64 -// +build gc package unix diff --git a/unix/syscall_unix_test.go b/unix/syscall_unix_test.go index d147923c..29c158fb 100644 --- a/unix/syscall_unix_test.go +++ b/unix/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 unix_test diff --git a/unix/syscall_zos_s390x.go b/unix/syscall_zos_s390x.go index 4596d041..d99d05f1 100644 --- a/unix/syscall_zos_s390x.go +++ b/unix/syscall_zos_s390x.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build zos && s390x -// +build zos,s390x package unix diff --git a/unix/syscall_zos_test.go b/unix/syscall_zos_test.go index 30ace208..4cd79bfa 100644 --- a/unix/syscall_zos_test.go +++ b/unix/syscall_zos_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build zos && s390x -// +build zos,s390x package unix_test diff --git a/unix/sysvshm_linux.go b/unix/sysvshm_linux.go index 2c3a4437..4fcd38de 100644 --- a/unix/sysvshm_linux.go +++ b/unix/sysvshm_linux.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build linux -// +build linux package unix diff --git a/unix/sysvshm_unix.go b/unix/sysvshm_unix.go index 5bb41d17..79a84f18 100644 --- a/unix/sysvshm_unix.go +++ b/unix/sysvshm_unix.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build (darwin && !ios) || linux -// +build darwin,!ios linux package unix diff --git a/unix/sysvshm_unix_other.go b/unix/sysvshm_unix_other.go index 71bddefd..9eb0db66 100644 --- a/unix/sysvshm_unix_other.go +++ b/unix/sysvshm_unix_other.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/unix/sysvshm_unix_test.go b/unix/sysvshm_unix_test.go index c1eff8dd..91e16dad 100644 --- a/unix/sysvshm_unix_test.go +++ b/unix/sysvshm_unix_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build (darwin && amd64) || linux -// +build darwin,amd64 linux package unix_test diff --git a/unix/timestruct.go b/unix/timestruct.go index 616b1b28..7997b190 100644 --- a/unix/timestruct.go +++ b/unix/timestruct.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos -// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos package unix diff --git a/unix/timestruct_test.go b/unix/timestruct_test.go index e39df4cb..ceb7375f 100644 --- a/unix/timestruct_test.go +++ b/unix/timestruct_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 unix_test diff --git a/unix/types_aix.go b/unix/types_aix.go index bfa2a706..f639099f 100644 --- a/unix/types_aix.go +++ b/unix/types_aix.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ignore && aix -// +build ignore,aix /* Input to cgo -godefs. See also mkerrors.sh and mkall.sh diff --git a/unix/types_darwin.go b/unix/types_darwin.go index 0e8ebe5a..7ed32a1a 100644 --- a/unix/types_darwin.go +++ b/unix/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 README.md diff --git a/unix/types_dragonfly.go b/unix/types_dragonfly.go index 32f8acf6..a89ec017 100644 --- a/unix/types_dragonfly.go +++ b/unix/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 README.md diff --git a/unix/types_freebsd.go b/unix/types_freebsd.go index 0687a155..23e3a026 100644 --- a/unix/types_freebsd.go +++ b/unix/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 README.md diff --git a/unix/types_netbsd.go b/unix/types_netbsd.go index 8bcdfe63..d9174161 100644 --- a/unix/types_netbsd.go +++ b/unix/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 README.md diff --git a/unix/types_openbsd.go b/unix/types_openbsd.go index 8cdd8fa0..71478aa7 100644 --- a/unix/types_openbsd.go +++ b/unix/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 README.md diff --git a/unix/types_solaris.go b/unix/types_solaris.go index 89e4c51e..986cff90 100644 --- a/unix/types_solaris.go +++ b/unix/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 README.md diff --git a/unix/xattr_bsd.go b/unix/xattr_bsd.go index f5f8e9f3..e1687939 100644 --- a/unix/xattr_bsd.go +++ b/unix/xattr_bsd.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build freebsd || netbsd -// +build freebsd netbsd package unix diff --git a/unix/xattr_test.go b/unix/xattr_test.go index 94411bd0..a8e4fb86 100644 --- a/unix/xattr_test.go +++ b/unix/xattr_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin || freebsd || linux || netbsd -// +build darwin freebsd linux netbsd package unix_test diff --git a/unix/zerrors_aix_ppc.go b/unix/zerrors_aix_ppc.go index ca9799b7..2fb219d7 100644 --- a/unix/zerrors_aix_ppc.go +++ b/unix/zerrors_aix_ppc.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build ppc && aix -// +build ppc,aix // Created by cgo -godefs - DO NOT EDIT // cgo -godefs -- -maix32 _const.go diff --git a/unix/zerrors_aix_ppc64.go b/unix/zerrors_aix_ppc64.go index 200c8c26..b0e6f5c8 100644 --- a/unix/zerrors_aix_ppc64.go +++ b/unix/zerrors_aix_ppc64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build ppc64 && aix -// +build ppc64,aix // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -maix64 _const.go diff --git a/unix/zerrors_darwin_amd64.go b/unix/zerrors_darwin_amd64.go index 14300762..e40fa852 100644 --- a/unix/zerrors_darwin_amd64.go +++ b/unix/zerrors_darwin_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build amd64 && darwin -// +build amd64,darwin // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -m64 _const.go diff --git a/unix/zerrors_darwin_arm64.go b/unix/zerrors_darwin_arm64.go index ab044a74..bb02aa6c 100644 --- a/unix/zerrors_darwin_arm64.go +++ b/unix/zerrors_darwin_arm64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm64 && darwin -// +build arm64,darwin // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -m64 _const.go diff --git a/unix/zerrors_dragonfly_amd64.go b/unix/zerrors_dragonfly_amd64.go index 17bba0e4..c0e0f869 100644 --- a/unix/zerrors_dragonfly_amd64.go +++ b/unix/zerrors_dragonfly_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build amd64 && dragonfly -// +build amd64,dragonfly // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -m64 _const.go diff --git a/unix/zerrors_freebsd_386.go b/unix/zerrors_freebsd_386.go index f8c2c513..6c692390 100644 --- a/unix/zerrors_freebsd_386.go +++ b/unix/zerrors_freebsd_386.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build 386 && freebsd -// +build 386,freebsd // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -m32 _const.go diff --git a/unix/zerrors_freebsd_amd64.go b/unix/zerrors_freebsd_amd64.go index 96310c3b..dd9163f8 100644 --- a/unix/zerrors_freebsd_amd64.go +++ b/unix/zerrors_freebsd_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build amd64 && freebsd -// +build amd64,freebsd // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -m64 _const.go diff --git a/unix/zerrors_freebsd_arm.go b/unix/zerrors_freebsd_arm.go index 777b69de..493a2a79 100644 --- a/unix/zerrors_freebsd_arm.go +++ b/unix/zerrors_freebsd_arm.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm && freebsd -// +build arm,freebsd // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- _const.go diff --git a/unix/zerrors_freebsd_arm64.go b/unix/zerrors_freebsd_arm64.go index c557ac2d..8b437b30 100644 --- a/unix/zerrors_freebsd_arm64.go +++ b/unix/zerrors_freebsd_arm64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm64 && freebsd -// +build arm64,freebsd // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -m64 _const.go diff --git a/unix/zerrors_freebsd_riscv64.go b/unix/zerrors_freebsd_riscv64.go index 341b4d96..67c02dd5 100644 --- a/unix/zerrors_freebsd_riscv64.go +++ b/unix/zerrors_freebsd_riscv64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build riscv64 && freebsd -// +build riscv64,freebsd // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -m64 _const.go diff --git a/unix/zerrors_linux.go b/unix/zerrors_linux.go index f9c7f479..2409c447 100644 --- a/unix/zerrors_linux.go +++ b/unix/zerrors_linux.go @@ -1,7 +1,6 @@ // Code generated by mkmerge; DO NOT EDIT. //go:build linux -// +build linux package unix diff --git a/unix/zerrors_linux_386.go b/unix/zerrors_linux_386.go index 30aee00a..4920821c 100644 --- a/unix/zerrors_linux_386.go +++ b/unix/zerrors_linux_386.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build 386 && linux -// +build 386,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -Wall -Werror -static -I/tmp/386/include -m32 _const.go diff --git a/unix/zerrors_linux_amd64.go b/unix/zerrors_linux_amd64.go index 8ebfa512..a0c1e411 100644 --- a/unix/zerrors_linux_amd64.go +++ b/unix/zerrors_linux_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build amd64 && linux -// +build amd64,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -Wall -Werror -static -I/tmp/amd64/include -m64 _const.go diff --git a/unix/zerrors_linux_arm.go b/unix/zerrors_linux_arm.go index 271a21cd..c6398556 100644 --- a/unix/zerrors_linux_arm.go +++ b/unix/zerrors_linux_arm.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm && linux -// +build arm,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -Wall -Werror -static -I/tmp/arm/include _const.go diff --git a/unix/zerrors_linux_arm64.go b/unix/zerrors_linux_arm64.go index 910c330a..47cc62e2 100644 --- a/unix/zerrors_linux_arm64.go +++ b/unix/zerrors_linux_arm64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm64 && linux -// +build arm64,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -Wall -Werror -static -I/tmp/arm64/include -fsigned-char _const.go diff --git a/unix/zerrors_linux_loong64.go b/unix/zerrors_linux_loong64.go index a640798c..e6467bd2 100644 --- a/unix/zerrors_linux_loong64.go +++ b/unix/zerrors_linux_loong64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build loong64 && linux -// +build loong64,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -Wall -Werror -static -I/tmp/loong64/include _const.go diff --git a/unix/zerrors_linux_mips.go b/unix/zerrors_linux_mips.go index 0d5925d3..54694642 100644 --- a/unix/zerrors_linux_mips.go +++ b/unix/zerrors_linux_mips.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build mips && linux -// +build mips,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -Wall -Werror -static -I/tmp/mips/include _const.go diff --git a/unix/zerrors_linux_mips64.go b/unix/zerrors_linux_mips64.go index d72a00e0..3adb81d7 100644 --- a/unix/zerrors_linux_mips64.go +++ b/unix/zerrors_linux_mips64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build mips64 && linux -// +build mips64,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -Wall -Werror -static -I/tmp/mips64/include _const.go diff --git a/unix/zerrors_linux_mips64le.go b/unix/zerrors_linux_mips64le.go index 02ba129f..2dfe98f0 100644 --- a/unix/zerrors_linux_mips64le.go +++ b/unix/zerrors_linux_mips64le.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build mips64le && linux -// +build mips64le,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -Wall -Werror -static -I/tmp/mips64le/include _const.go diff --git a/unix/zerrors_linux_mipsle.go b/unix/zerrors_linux_mipsle.go index 8daa6dd9..f5398f84 100644 --- a/unix/zerrors_linux_mipsle.go +++ b/unix/zerrors_linux_mipsle.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build mipsle && linux -// +build mipsle,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -Wall -Werror -static -I/tmp/mipsle/include _const.go diff --git a/unix/zerrors_linux_ppc.go b/unix/zerrors_linux_ppc.go index 63c8fa2f..c54f152d 100644 --- a/unix/zerrors_linux_ppc.go +++ b/unix/zerrors_linux_ppc.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build ppc && linux -// +build ppc,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -Wall -Werror -static -I/tmp/ppc/include _const.go diff --git a/unix/zerrors_linux_ppc64.go b/unix/zerrors_linux_ppc64.go index 930799ec..76057dc7 100644 --- a/unix/zerrors_linux_ppc64.go +++ b/unix/zerrors_linux_ppc64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build ppc64 && linux -// +build ppc64,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -Wall -Werror -static -I/tmp/ppc64/include _const.go diff --git a/unix/zerrors_linux_ppc64le.go b/unix/zerrors_linux_ppc64le.go index 8605a7dd..e0c3725e 100644 --- a/unix/zerrors_linux_ppc64le.go +++ b/unix/zerrors_linux_ppc64le.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build ppc64le && linux -// +build ppc64le,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -Wall -Werror -static -I/tmp/ppc64le/include _const.go diff --git a/unix/zerrors_linux_riscv64.go b/unix/zerrors_linux_riscv64.go index 95a016f1..c597e31d 100644 --- a/unix/zerrors_linux_riscv64.go +++ b/unix/zerrors_linux_riscv64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build riscv64 && linux -// +build riscv64,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -Wall -Werror -static -I/tmp/riscv64/include _const.go diff --git a/unix/zerrors_linux_s390x.go b/unix/zerrors_linux_s390x.go index 1ae0108f..11619d4e 100644 --- a/unix/zerrors_linux_s390x.go +++ b/unix/zerrors_linux_s390x.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build s390x && linux -// +build s390x,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -Wall -Werror -static -I/tmp/s390x/include -fsigned-char _const.go diff --git a/unix/zerrors_linux_sparc64.go b/unix/zerrors_linux_sparc64.go index 1bb7c633..396d994d 100644 --- a/unix/zerrors_linux_sparc64.go +++ b/unix/zerrors_linux_sparc64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build sparc64 && linux -// +build sparc64,linux // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -Wall -Werror -static -I/tmp/sparc64/include _const.go diff --git a/unix/zerrors_netbsd_386.go b/unix/zerrors_netbsd_386.go index 72f7420d..130085df 100644 --- a/unix/zerrors_netbsd_386.go +++ b/unix/zerrors_netbsd_386.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build 386 && netbsd -// +build 386,netbsd // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -m32 _const.go diff --git a/unix/zerrors_netbsd_amd64.go b/unix/zerrors_netbsd_amd64.go index 8d4eb0c0..84769a1a 100644 --- a/unix/zerrors_netbsd_amd64.go +++ b/unix/zerrors_netbsd_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build amd64 && netbsd -// +build amd64,netbsd // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -m64 _const.go diff --git a/unix/zerrors_netbsd_arm.go b/unix/zerrors_netbsd_arm.go index 9eef9749..602ded00 100644 --- a/unix/zerrors_netbsd_arm.go +++ b/unix/zerrors_netbsd_arm.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm && netbsd -// +build arm,netbsd // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -marm _const.go diff --git a/unix/zerrors_netbsd_arm64.go b/unix/zerrors_netbsd_arm64.go index 3b62ba19..efc0406e 100644 --- a/unix/zerrors_netbsd_arm64.go +++ b/unix/zerrors_netbsd_arm64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm64 && netbsd -// +build arm64,netbsd // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -m64 _const.go diff --git a/unix/zerrors_openbsd_386.go b/unix/zerrors_openbsd_386.go index af20e474..5a6500f8 100644 --- a/unix/zerrors_openbsd_386.go +++ b/unix/zerrors_openbsd_386.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build 386 && openbsd -// +build 386,openbsd // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -m32 _const.go diff --git a/unix/zerrors_openbsd_amd64.go b/unix/zerrors_openbsd_amd64.go index 6015fcb2..a5aeeb97 100644 --- a/unix/zerrors_openbsd_amd64.go +++ b/unix/zerrors_openbsd_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build amd64 && openbsd -// +build amd64,openbsd // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -m64 _const.go diff --git a/unix/zerrors_openbsd_arm.go b/unix/zerrors_openbsd_arm.go index 8d44955e..0e9748a7 100644 --- a/unix/zerrors_openbsd_arm.go +++ b/unix/zerrors_openbsd_arm.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm && openbsd -// +build arm,openbsd // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- _const.go diff --git a/unix/zerrors_openbsd_arm64.go b/unix/zerrors_openbsd_arm64.go index ae16fe75..4f4449ab 100644 --- a/unix/zerrors_openbsd_arm64.go +++ b/unix/zerrors_openbsd_arm64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm64 && openbsd -// +build arm64,openbsd // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -m64 _const.go diff --git a/unix/zerrors_openbsd_mips64.go b/unix/zerrors_openbsd_mips64.go index 03d90fe3..76a363f0 100644 --- a/unix/zerrors_openbsd_mips64.go +++ b/unix/zerrors_openbsd_mips64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build mips64 && openbsd -// +build mips64,openbsd // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -m64 _const.go diff --git a/unix/zerrors_openbsd_ppc64.go b/unix/zerrors_openbsd_ppc64.go index 8e2c51b1..43ca0cdf 100644 --- a/unix/zerrors_openbsd_ppc64.go +++ b/unix/zerrors_openbsd_ppc64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build ppc64 && openbsd -// +build ppc64,openbsd // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -m64 _const.go diff --git a/unix/zerrors_openbsd_riscv64.go b/unix/zerrors_openbsd_riscv64.go index 13d40303..b1b8bb20 100644 --- a/unix/zerrors_openbsd_riscv64.go +++ b/unix/zerrors_openbsd_riscv64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build riscv64 && openbsd -// +build riscv64,openbsd // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -m64 _const.go diff --git a/unix/zerrors_solaris_amd64.go b/unix/zerrors_solaris_amd64.go index 1afee6a0..d2ddd317 100644 --- a/unix/zerrors_solaris_amd64.go +++ b/unix/zerrors_solaris_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build amd64 && solaris -// +build amd64,solaris // Code generated by cmd/cgo -godefs; DO NOT EDIT. // cgo -godefs -- -m64 _const.go diff --git a/unix/zerrors_zos_s390x.go b/unix/zerrors_zos_s390x.go index fc7d0506..4dfd2e05 100644 --- a/unix/zerrors_zos_s390x.go +++ b/unix/zerrors_zos_s390x.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build zos && s390x -// +build zos,s390x // Hand edited based on zerrors_linux_s390x.go // TODO: auto-generate. diff --git a/unix/zptrace_armnn_linux.go b/unix/zptrace_armnn_linux.go index 97f20ca2..586317c7 100644 --- a/unix/zptrace_armnn_linux.go +++ b/unix/zptrace_armnn_linux.go @@ -1,8 +1,6 @@ // Code generated by linux/mkall.go generatePtracePair("arm", "arm64"). DO NOT EDIT. //go:build linux && (arm || arm64) -// +build linux -// +build arm arm64 package unix diff --git a/unix/zptrace_mipsnn_linux.go b/unix/zptrace_mipsnn_linux.go index 0b5f7943..d7c881be 100644 --- a/unix/zptrace_mipsnn_linux.go +++ b/unix/zptrace_mipsnn_linux.go @@ -1,8 +1,6 @@ // Code generated by linux/mkall.go generatePtracePair("mips", "mips64"). DO NOT EDIT. //go:build linux && (mips || mips64) -// +build linux -// +build mips mips64 package unix diff --git a/unix/zptrace_mipsnnle_linux.go b/unix/zptrace_mipsnnle_linux.go index 2807f7e6..2d2de5d2 100644 --- a/unix/zptrace_mipsnnle_linux.go +++ b/unix/zptrace_mipsnnle_linux.go @@ -1,8 +1,6 @@ // Code generated by linux/mkall.go generatePtracePair("mipsle", "mips64le"). DO NOT EDIT. //go:build linux && (mipsle || mips64le) -// +build linux -// +build mipsle mips64le package unix diff --git a/unix/zptrace_x86_linux.go b/unix/zptrace_x86_linux.go index 281ea64e..5adc79fb 100644 --- a/unix/zptrace_x86_linux.go +++ b/unix/zptrace_x86_linux.go @@ -1,8 +1,6 @@ // Code generated by linux/mkall.go generatePtracePair("386", "amd64"). DO NOT EDIT. //go:build linux && (386 || amd64) -// +build linux -// +build 386 amd64 package unix diff --git a/unix/zsyscall_aix_ppc.go b/unix/zsyscall_aix_ppc.go index d1d1d233..6ea64a3c 100644 --- a/unix/zsyscall_aix_ppc.go +++ b/unix/zsyscall_aix_ppc.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build aix && ppc -// +build aix,ppc package unix diff --git a/unix/zsyscall_aix_ppc64.go b/unix/zsyscall_aix_ppc64.go index f99a18ad..99ee4399 100644 --- a/unix/zsyscall_aix_ppc64.go +++ b/unix/zsyscall_aix_ppc64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build aix && ppc64 -// +build aix,ppc64 package unix diff --git a/unix/zsyscall_aix_ppc64_gc.go b/unix/zsyscall_aix_ppc64_gc.go index c4d50ae5..b68a7836 100644 --- a/unix/zsyscall_aix_ppc64_gc.go +++ b/unix/zsyscall_aix_ppc64_gc.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build aix && ppc64 && gc -// +build aix,ppc64,gc package unix diff --git a/unix/zsyscall_aix_ppc64_gccgo.go b/unix/zsyscall_aix_ppc64_gccgo.go index 6903d3b0..0a87450b 100644 --- a/unix/zsyscall_aix_ppc64_gccgo.go +++ b/unix/zsyscall_aix_ppc64_gccgo.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build aix && ppc64 && gccgo -// +build aix,ppc64,gccgo package unix diff --git a/unix/zsyscall_darwin_amd64.go b/unix/zsyscall_darwin_amd64.go index 1cad561e..ccb02f24 100644 --- a/unix/zsyscall_darwin_amd64.go +++ b/unix/zsyscall_darwin_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build darwin && amd64 -// +build darwin,amd64 package unix diff --git a/unix/zsyscall_darwin_arm64.go b/unix/zsyscall_darwin_arm64.go index b18edbd0..1b40b997 100644 --- a/unix/zsyscall_darwin_arm64.go +++ b/unix/zsyscall_darwin_arm64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build darwin && arm64 -// +build darwin,arm64 package unix diff --git a/unix/zsyscall_dragonfly_amd64.go b/unix/zsyscall_dragonfly_amd64.go index 0c67df64..aad65fc7 100644 --- a/unix/zsyscall_dragonfly_amd64.go +++ b/unix/zsyscall_dragonfly_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build dragonfly && amd64 -// +build dragonfly,amd64 package unix diff --git a/unix/zsyscall_freebsd_386.go b/unix/zsyscall_freebsd_386.go index e6e05d14..c0096391 100644 --- a/unix/zsyscall_freebsd_386.go +++ b/unix/zsyscall_freebsd_386.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build freebsd && 386 -// +build freebsd,386 package unix diff --git a/unix/zsyscall_freebsd_amd64.go b/unix/zsyscall_freebsd_amd64.go index 7508acca..7664df74 100644 --- a/unix/zsyscall_freebsd_amd64.go +++ b/unix/zsyscall_freebsd_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build freebsd && amd64 -// +build freebsd,amd64 package unix diff --git a/unix/zsyscall_freebsd_arm.go b/unix/zsyscall_freebsd_arm.go index 7b56aead..ae099182 100644 --- a/unix/zsyscall_freebsd_arm.go +++ b/unix/zsyscall_freebsd_arm.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build freebsd && arm -// +build freebsd,arm package unix diff --git a/unix/zsyscall_freebsd_arm64.go b/unix/zsyscall_freebsd_arm64.go index cc623dca..11fd5d45 100644 --- a/unix/zsyscall_freebsd_arm64.go +++ b/unix/zsyscall_freebsd_arm64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build freebsd && arm64 -// +build freebsd,arm64 package unix diff --git a/unix/zsyscall_freebsd_riscv64.go b/unix/zsyscall_freebsd_riscv64.go index 58184919..c3d2d653 100644 --- a/unix/zsyscall_freebsd_riscv64.go +++ b/unix/zsyscall_freebsd_riscv64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build freebsd && riscv64 -// +build freebsd,riscv64 package unix diff --git a/unix/zsyscall_illumos_amd64.go b/unix/zsyscall_illumos_amd64.go index 6be25cd1..c698cbc0 100644 --- a/unix/zsyscall_illumos_amd64.go +++ b/unix/zsyscall_illumos_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build illumos && amd64 -// +build illumos,amd64 package unix diff --git a/unix/zsyscall_linux.go b/unix/zsyscall_linux.go index 863d7dde..faca7a55 100644 --- a/unix/zsyscall_linux.go +++ b/unix/zsyscall_linux.go @@ -1,7 +1,6 @@ // Code generated by mkmerge; DO NOT EDIT. //go:build linux -// +build linux package unix diff --git a/unix/zsyscall_linux_386.go b/unix/zsyscall_linux_386.go index 07b549cc..4def3e9f 100644 --- a/unix/zsyscall_linux_386.go +++ b/unix/zsyscall_linux_386.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build linux && 386 -// +build linux,386 package unix diff --git a/unix/zsyscall_linux_amd64.go b/unix/zsyscall_linux_amd64.go index 5f481bf8..fef2bc8b 100644 --- a/unix/zsyscall_linux_amd64.go +++ b/unix/zsyscall_linux_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build linux && amd64 -// +build linux,amd64 package unix diff --git a/unix/zsyscall_linux_arm.go b/unix/zsyscall_linux_arm.go index 824cd52c..a9fd76a8 100644 --- a/unix/zsyscall_linux_arm.go +++ b/unix/zsyscall_linux_arm.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build linux && arm -// +build linux,arm package unix diff --git a/unix/zsyscall_linux_arm64.go b/unix/zsyscall_linux_arm64.go index e77aecfe..46006502 100644 --- a/unix/zsyscall_linux_arm64.go +++ b/unix/zsyscall_linux_arm64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build linux && arm64 -// +build linux,arm64 package unix diff --git a/unix/zsyscall_linux_loong64.go b/unix/zsyscall_linux_loong64.go index 806ffd1e..c8987d26 100644 --- a/unix/zsyscall_linux_loong64.go +++ b/unix/zsyscall_linux_loong64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build linux && loong64 -// +build linux,loong64 package unix diff --git a/unix/zsyscall_linux_mips.go b/unix/zsyscall_linux_mips.go index 961a3afb..921f4306 100644 --- a/unix/zsyscall_linux_mips.go +++ b/unix/zsyscall_linux_mips.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build linux && mips -// +build linux,mips package unix diff --git a/unix/zsyscall_linux_mips64.go b/unix/zsyscall_linux_mips64.go index ed05005e..44f06782 100644 --- a/unix/zsyscall_linux_mips64.go +++ b/unix/zsyscall_linux_mips64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build linux && mips64 -// +build linux,mips64 package unix diff --git a/unix/zsyscall_linux_mips64le.go b/unix/zsyscall_linux_mips64le.go index d365b718..e7fa0abf 100644 --- a/unix/zsyscall_linux_mips64le.go +++ b/unix/zsyscall_linux_mips64le.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build linux && mips64le -// +build linux,mips64le package unix diff --git a/unix/zsyscall_linux_mipsle.go b/unix/zsyscall_linux_mipsle.go index c3f1b8bb..8c512567 100644 --- a/unix/zsyscall_linux_mipsle.go +++ b/unix/zsyscall_linux_mipsle.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build linux && mipsle -// +build linux,mipsle package unix diff --git a/unix/zsyscall_linux_ppc.go b/unix/zsyscall_linux_ppc.go index a6574cf9..7392fd45 100644 --- a/unix/zsyscall_linux_ppc.go +++ b/unix/zsyscall_linux_ppc.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build linux && ppc -// +build linux,ppc package unix diff --git a/unix/zsyscall_linux_ppc64.go b/unix/zsyscall_linux_ppc64.go index f4099026..41180434 100644 --- a/unix/zsyscall_linux_ppc64.go +++ b/unix/zsyscall_linux_ppc64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build linux && ppc64 -// +build linux,ppc64 package unix diff --git a/unix/zsyscall_linux_ppc64le.go b/unix/zsyscall_linux_ppc64le.go index 9dfcc299..40c6ce7a 100644 --- a/unix/zsyscall_linux_ppc64le.go +++ b/unix/zsyscall_linux_ppc64le.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build linux && ppc64le -// +build linux,ppc64le package unix diff --git a/unix/zsyscall_linux_riscv64.go b/unix/zsyscall_linux_riscv64.go index 0ab4f2ed..2cfe34ad 100644 --- a/unix/zsyscall_linux_riscv64.go +++ b/unix/zsyscall_linux_riscv64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build linux && riscv64 -// +build linux,riscv64 package unix diff --git a/unix/zsyscall_linux_s390x.go b/unix/zsyscall_linux_s390x.go index 6cde3223..61e6f070 100644 --- a/unix/zsyscall_linux_s390x.go +++ b/unix/zsyscall_linux_s390x.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build linux && s390x -// +build linux,s390x package unix diff --git a/unix/zsyscall_linux_sparc64.go b/unix/zsyscall_linux_sparc64.go index 5253d65b..834b8420 100644 --- a/unix/zsyscall_linux_sparc64.go +++ b/unix/zsyscall_linux_sparc64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build linux && sparc64 -// +build linux,sparc64 package unix diff --git a/unix/zsyscall_netbsd_386.go b/unix/zsyscall_netbsd_386.go index 2df3c5ba..e91ebc14 100644 --- a/unix/zsyscall_netbsd_386.go +++ b/unix/zsyscall_netbsd_386.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build netbsd && 386 -// +build netbsd,386 package unix diff --git a/unix/zsyscall_netbsd_amd64.go b/unix/zsyscall_netbsd_amd64.go index a60556ba..be28babb 100644 --- a/unix/zsyscall_netbsd_amd64.go +++ b/unix/zsyscall_netbsd_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build netbsd && amd64 -// +build netbsd,amd64 package unix diff --git a/unix/zsyscall_netbsd_arm.go b/unix/zsyscall_netbsd_arm.go index 9f788917..fb587e82 100644 --- a/unix/zsyscall_netbsd_arm.go +++ b/unix/zsyscall_netbsd_arm.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build netbsd && arm -// +build netbsd,arm package unix diff --git a/unix/zsyscall_netbsd_arm64.go b/unix/zsyscall_netbsd_arm64.go index 82a4cb2d..d576438b 100644 --- a/unix/zsyscall_netbsd_arm64.go +++ b/unix/zsyscall_netbsd_arm64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build netbsd && arm64 -// +build netbsd,arm64 package unix diff --git a/unix/zsyscall_openbsd_386.go b/unix/zsyscall_openbsd_386.go index 66b3b645..9da3ec37 100644 --- a/unix/zsyscall_openbsd_386.go +++ b/unix/zsyscall_openbsd_386.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build openbsd && 386 -// +build openbsd,386 package unix diff --git a/unix/zsyscall_openbsd_amd64.go b/unix/zsyscall_openbsd_amd64.go index c5c4cc11..cc273c41 100644 --- a/unix/zsyscall_openbsd_amd64.go +++ b/unix/zsyscall_openbsd_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build openbsd && amd64 -// +build openbsd,amd64 package unix diff --git a/unix/zsyscall_openbsd_arm.go b/unix/zsyscall_openbsd_arm.go index 93bfbb32..fa34e22e 100644 --- a/unix/zsyscall_openbsd_arm.go +++ b/unix/zsyscall_openbsd_arm.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build openbsd && arm -// +build openbsd,arm package unix diff --git a/unix/zsyscall_openbsd_arm64.go b/unix/zsyscall_openbsd_arm64.go index a107b8fd..ab612214 100644 --- a/unix/zsyscall_openbsd_arm64.go +++ b/unix/zsyscall_openbsd_arm64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build openbsd && arm64 -// +build openbsd,arm64 package unix diff --git a/unix/zsyscall_openbsd_mips64.go b/unix/zsyscall_openbsd_mips64.go index c427de50..3882790a 100644 --- a/unix/zsyscall_openbsd_mips64.go +++ b/unix/zsyscall_openbsd_mips64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build openbsd && mips64 -// +build openbsd,mips64 package unix diff --git a/unix/zsyscall_openbsd_ppc64.go b/unix/zsyscall_openbsd_ppc64.go index 60c1a99a..172ba7f6 100644 --- a/unix/zsyscall_openbsd_ppc64.go +++ b/unix/zsyscall_openbsd_ppc64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build openbsd && ppc64 -// +build openbsd,ppc64 package unix diff --git a/unix/zsyscall_openbsd_riscv64.go b/unix/zsyscall_openbsd_riscv64.go index 52eba360..fd8e6f62 100644 --- a/unix/zsyscall_openbsd_riscv64.go +++ b/unix/zsyscall_openbsd_riscv64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build openbsd && riscv64 -// +build openbsd,riscv64 package unix diff --git a/unix/zsyscall_solaris_amd64.go b/unix/zsyscall_solaris_amd64.go index b4018946..829b87fe 100644 --- a/unix/zsyscall_solaris_amd64.go +++ b/unix/zsyscall_solaris_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build solaris && amd64 -// +build solaris,amd64 package unix diff --git a/unix/zsyscall_zos_s390x.go b/unix/zsyscall_zos_s390x.go index 1d8fe1d4..94f01123 100644 --- a/unix/zsyscall_zos_s390x.go +++ b/unix/zsyscall_zos_s390x.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build zos && s390x -// +build zos,s390x package unix diff --git a/unix/zsysctl_openbsd_386.go b/unix/zsysctl_openbsd_386.go index 55e04847..3a58ae81 100644 --- a/unix/zsysctl_openbsd_386.go +++ b/unix/zsysctl_openbsd_386.go @@ -2,7 +2,6 @@ // Code generated by the command above; DO NOT EDIT. //go:build 386 && openbsd -// +build 386,openbsd package unix diff --git a/unix/zsysctl_openbsd_amd64.go b/unix/zsysctl_openbsd_amd64.go index d2243cf8..dcb7a0eb 100644 --- a/unix/zsysctl_openbsd_amd64.go +++ b/unix/zsysctl_openbsd_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; DO NOT EDIT. //go:build amd64 && openbsd -// +build amd64,openbsd package unix diff --git a/unix/zsysctl_openbsd_arm.go b/unix/zsysctl_openbsd_arm.go index 82dc51bd..db5a7bf1 100644 --- a/unix/zsysctl_openbsd_arm.go +++ b/unix/zsysctl_openbsd_arm.go @@ -2,7 +2,6 @@ // Code generated by the command above; DO NOT EDIT. //go:build arm && openbsd -// +build arm,openbsd package unix diff --git a/unix/zsysctl_openbsd_arm64.go b/unix/zsysctl_openbsd_arm64.go index cbdda1a4..7be575a7 100644 --- a/unix/zsysctl_openbsd_arm64.go +++ b/unix/zsysctl_openbsd_arm64.go @@ -2,7 +2,6 @@ // Code generated by the command above; DO NOT EDIT. //go:build arm64 && openbsd -// +build arm64,openbsd package unix diff --git a/unix/zsysctl_openbsd_mips64.go b/unix/zsysctl_openbsd_mips64.go index f55eae1a..d6e3174c 100644 --- a/unix/zsysctl_openbsd_mips64.go +++ b/unix/zsysctl_openbsd_mips64.go @@ -2,7 +2,6 @@ // Code generated by the command above; DO NOT EDIT. //go:build mips64 && openbsd -// +build mips64,openbsd package unix diff --git a/unix/zsysctl_openbsd_ppc64.go b/unix/zsysctl_openbsd_ppc64.go index e4405447..ee97157d 100644 --- a/unix/zsysctl_openbsd_ppc64.go +++ b/unix/zsysctl_openbsd_ppc64.go @@ -2,7 +2,6 @@ // Code generated by the command above; DO NOT EDIT. //go:build ppc64 && openbsd -// +build ppc64,openbsd package unix diff --git a/unix/zsysctl_openbsd_riscv64.go b/unix/zsysctl_openbsd_riscv64.go index a0db82fc..35c3b91d 100644 --- a/unix/zsysctl_openbsd_riscv64.go +++ b/unix/zsysctl_openbsd_riscv64.go @@ -2,7 +2,6 @@ // Code generated by the command above; DO NOT EDIT. //go:build riscv64 && openbsd -// +build riscv64,openbsd package unix diff --git a/unix/zsysnum_darwin_amd64.go b/unix/zsysnum_darwin_amd64.go index f8298ff9..5edda768 100644 --- a/unix/zsysnum_darwin_amd64.go +++ b/unix/zsysnum_darwin_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build amd64 && darwin -// +build amd64,darwin package unix diff --git a/unix/zsysnum_darwin_arm64.go b/unix/zsysnum_darwin_arm64.go index 5eb433bb..0dc9e8b4 100644 --- a/unix/zsysnum_darwin_arm64.go +++ b/unix/zsysnum_darwin_arm64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm64 && darwin -// +build arm64,darwin package unix diff --git a/unix/zsysnum_dragonfly_amd64.go b/unix/zsysnum_dragonfly_amd64.go index 703675c0..308ddf3a 100644 --- a/unix/zsysnum_dragonfly_amd64.go +++ b/unix/zsysnum_dragonfly_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build amd64 && dragonfly -// +build amd64,dragonfly package unix diff --git a/unix/zsysnum_freebsd_386.go b/unix/zsysnum_freebsd_386.go index 4e0d9610..418664e3 100644 --- a/unix/zsysnum_freebsd_386.go +++ b/unix/zsysnum_freebsd_386.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build 386 && freebsd -// +build 386,freebsd package unix diff --git a/unix/zsysnum_freebsd_amd64.go b/unix/zsysnum_freebsd_amd64.go index 01636b83..34d0b86d 100644 --- a/unix/zsysnum_freebsd_amd64.go +++ b/unix/zsysnum_freebsd_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build amd64 && freebsd -// +build amd64,freebsd package unix diff --git a/unix/zsysnum_freebsd_arm.go b/unix/zsysnum_freebsd_arm.go index ad99bc10..b71cf45e 100644 --- a/unix/zsysnum_freebsd_arm.go +++ b/unix/zsysnum_freebsd_arm.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm && freebsd -// +build arm,freebsd package unix diff --git a/unix/zsysnum_freebsd_arm64.go b/unix/zsysnum_freebsd_arm64.go index 89dcc427..e32df1c1 100644 --- a/unix/zsysnum_freebsd_arm64.go +++ b/unix/zsysnum_freebsd_arm64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm64 && freebsd -// +build arm64,freebsd package unix diff --git a/unix/zsysnum_freebsd_riscv64.go b/unix/zsysnum_freebsd_riscv64.go index ee37aaa0..15ad6111 100644 --- a/unix/zsysnum_freebsd_riscv64.go +++ b/unix/zsysnum_freebsd_riscv64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build riscv64 && freebsd -// +build riscv64,freebsd package unix diff --git a/unix/zsysnum_linux_386.go b/unix/zsysnum_linux_386.go index 9862853d..2d181ba7 100644 --- a/unix/zsysnum_linux_386.go +++ b/unix/zsysnum_linux_386.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build 386 && linux -// +build 386,linux package unix diff --git a/unix/zsysnum_linux_amd64.go b/unix/zsysnum_linux_amd64.go index 8901f0f4..2b25ab33 100644 --- a/unix/zsysnum_linux_amd64.go +++ b/unix/zsysnum_linux_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build amd64 && linux -// +build amd64,linux package unix diff --git a/unix/zsysnum_linux_arm.go b/unix/zsysnum_linux_arm.go index 6902c37e..b43e7c4c 100644 --- a/unix/zsysnum_linux_arm.go +++ b/unix/zsysnum_linux_arm.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm && linux -// +build arm,linux package unix diff --git a/unix/zsysnum_linux_arm64.go b/unix/zsysnum_linux_arm64.go index a6d3dff8..d50622f8 100644 --- a/unix/zsysnum_linux_arm64.go +++ b/unix/zsysnum_linux_arm64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm64 && linux -// +build arm64,linux package unix diff --git a/unix/zsysnum_linux_loong64.go b/unix/zsysnum_linux_loong64.go index b18f3f71..7c31dbe4 100644 --- a/unix/zsysnum_linux_loong64.go +++ b/unix/zsysnum_linux_loong64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build loong64 && linux -// +build loong64,linux package unix diff --git a/unix/zsysnum_linux_mips.go b/unix/zsysnum_linux_mips.go index 0302e5e3..2b01364d 100644 --- a/unix/zsysnum_linux_mips.go +++ b/unix/zsysnum_linux_mips.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build mips && linux -// +build mips,linux package unix diff --git a/unix/zsysnum_linux_mips64.go b/unix/zsysnum_linux_mips64.go index 6693ba4a..9bb31708 100644 --- a/unix/zsysnum_linux_mips64.go +++ b/unix/zsysnum_linux_mips64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build mips64 && linux -// +build mips64,linux package unix diff --git a/unix/zsysnum_linux_mips64le.go b/unix/zsysnum_linux_mips64le.go index fd93f498..8413fe6d 100644 --- a/unix/zsysnum_linux_mips64le.go +++ b/unix/zsysnum_linux_mips64le.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build mips64le && linux -// +build mips64le,linux package unix diff --git a/unix/zsysnum_linux_mipsle.go b/unix/zsysnum_linux_mipsle.go index 760ddcad..cf76a275 100644 --- a/unix/zsysnum_linux_mipsle.go +++ b/unix/zsysnum_linux_mipsle.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build mipsle && linux -// +build mipsle,linux package unix diff --git a/unix/zsysnum_linux_ppc.go b/unix/zsysnum_linux_ppc.go index cff2b255..79994227 100644 --- a/unix/zsysnum_linux_ppc.go +++ b/unix/zsysnum_linux_ppc.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build ppc && linux -// +build ppc,linux package unix diff --git a/unix/zsysnum_linux_ppc64.go b/unix/zsysnum_linux_ppc64.go index a4b2405d..75904d52 100644 --- a/unix/zsysnum_linux_ppc64.go +++ b/unix/zsysnum_linux_ppc64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build ppc64 && linux -// +build ppc64,linux package unix diff --git a/unix/zsysnum_linux_ppc64le.go b/unix/zsysnum_linux_ppc64le.go index aca54b4e..f5f681c3 100644 --- a/unix/zsysnum_linux_ppc64le.go +++ b/unix/zsysnum_linux_ppc64le.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build ppc64le && linux -// +build ppc64le,linux package unix diff --git a/unix/zsysnum_linux_riscv64.go b/unix/zsysnum_linux_riscv64.go index 9d1738d6..39195474 100644 --- a/unix/zsysnum_linux_riscv64.go +++ b/unix/zsysnum_linux_riscv64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build riscv64 && linux -// +build riscv64,linux package unix diff --git a/unix/zsysnum_linux_s390x.go b/unix/zsysnum_linux_s390x.go index 022878dc..f33ceef1 100644 --- a/unix/zsysnum_linux_s390x.go +++ b/unix/zsysnum_linux_s390x.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build s390x && linux -// +build s390x,linux package unix diff --git a/unix/zsysnum_linux_sparc64.go b/unix/zsysnum_linux_sparc64.go index 4100a761..a2ce59e7 100644 --- a/unix/zsysnum_linux_sparc64.go +++ b/unix/zsysnum_linux_sparc64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build sparc64 && linux -// +build sparc64,linux package unix diff --git a/unix/zsysnum_netbsd_386.go b/unix/zsysnum_netbsd_386.go index 3a6699eb..b2aa8cd4 100644 --- a/unix/zsysnum_netbsd_386.go +++ b/unix/zsysnum_netbsd_386.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build 386 && netbsd -// +build 386,netbsd package unix diff --git a/unix/zsysnum_netbsd_amd64.go b/unix/zsysnum_netbsd_amd64.go index 5677cd4f..524a1b1c 100644 --- a/unix/zsysnum_netbsd_amd64.go +++ b/unix/zsysnum_netbsd_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build amd64 && netbsd -// +build amd64,netbsd package unix diff --git a/unix/zsysnum_netbsd_arm.go b/unix/zsysnum_netbsd_arm.go index e784cb6d..d59b943a 100644 --- a/unix/zsysnum_netbsd_arm.go +++ b/unix/zsysnum_netbsd_arm.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm && netbsd -// +build arm,netbsd package unix diff --git a/unix/zsysnum_netbsd_arm64.go b/unix/zsysnum_netbsd_arm64.go index bd4952ef..31e771d5 100644 --- a/unix/zsysnum_netbsd_arm64.go +++ b/unix/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 unix diff --git a/unix/zsysnum_openbsd_386.go b/unix/zsysnum_openbsd_386.go index 59773381..9fd77c6c 100644 --- a/unix/zsysnum_openbsd_386.go +++ b/unix/zsysnum_openbsd_386.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build 386 && openbsd -// +build 386,openbsd package unix diff --git a/unix/zsysnum_openbsd_amd64.go b/unix/zsysnum_openbsd_amd64.go index 16af2918..af10af28 100644 --- a/unix/zsysnum_openbsd_amd64.go +++ b/unix/zsysnum_openbsd_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build amd64 && openbsd -// +build amd64,openbsd package unix diff --git a/unix/zsysnum_openbsd_arm.go b/unix/zsysnum_openbsd_arm.go index f59b18a9..cc2028af 100644 --- a/unix/zsysnum_openbsd_arm.go +++ b/unix/zsysnum_openbsd_arm.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm && openbsd -// +build arm,openbsd package unix diff --git a/unix/zsysnum_openbsd_arm64.go b/unix/zsysnum_openbsd_arm64.go index 721ef591..c06dd441 100644 --- a/unix/zsysnum_openbsd_arm64.go +++ b/unix/zsysnum_openbsd_arm64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm64 && openbsd -// +build arm64,openbsd package unix diff --git a/unix/zsysnum_openbsd_mips64.go b/unix/zsysnum_openbsd_mips64.go index 01c43a01..9ddbf3e0 100644 --- a/unix/zsysnum_openbsd_mips64.go +++ b/unix/zsysnum_openbsd_mips64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build mips64 && openbsd -// +build mips64,openbsd package unix diff --git a/unix/zsysnum_openbsd_ppc64.go b/unix/zsysnum_openbsd_ppc64.go index f258cfa2..19a6ee41 100644 --- a/unix/zsysnum_openbsd_ppc64.go +++ b/unix/zsysnum_openbsd_ppc64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build ppc64 && openbsd -// +build ppc64,openbsd package unix diff --git a/unix/zsysnum_openbsd_riscv64.go b/unix/zsysnum_openbsd_riscv64.go index 07919e0e..05192a78 100644 --- a/unix/zsysnum_openbsd_riscv64.go +++ b/unix/zsysnum_openbsd_riscv64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build riscv64 && openbsd -// +build riscv64,openbsd package unix diff --git a/unix/zsysnum_zos_s390x.go b/unix/zsysnum_zos_s390x.go index 073daad4..b2e30858 100644 --- a/unix/zsysnum_zos_s390x.go +++ b/unix/zsysnum_zos_s390x.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build zos && s390x -// +build zos,s390x package unix diff --git a/unix/ztypes_aix_ppc.go b/unix/ztypes_aix_ppc.go index 7a8161c1..3e6d57ca 100644 --- a/unix/ztypes_aix_ppc.go +++ b/unix/ztypes_aix_ppc.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build ppc && aix -// +build ppc,aix package unix diff --git a/unix/ztypes_aix_ppc64.go b/unix/ztypes_aix_ppc64.go index 07ed733c..3a219bdc 100644 --- a/unix/ztypes_aix_ppc64.go +++ b/unix/ztypes_aix_ppc64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build ppc64 && aix -// +build ppc64,aix package unix diff --git a/unix/ztypes_darwin_amd64.go b/unix/ztypes_darwin_amd64.go index 690cefc3..091d107f 100644 --- a/unix/ztypes_darwin_amd64.go +++ b/unix/ztypes_darwin_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build amd64 && darwin -// +build amd64,darwin package unix diff --git a/unix/ztypes_darwin_arm64.go b/unix/ztypes_darwin_arm64.go index 5bffc10e..28ff4ef7 100644 --- a/unix/ztypes_darwin_arm64.go +++ b/unix/ztypes_darwin_arm64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm64 && darwin -// +build arm64,darwin package unix diff --git a/unix/ztypes_dragonfly_amd64.go b/unix/ztypes_dragonfly_amd64.go index d0ba8e9b..30e405bb 100644 --- a/unix/ztypes_dragonfly_amd64.go +++ b/unix/ztypes_dragonfly_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build amd64 && dragonfly -// +build amd64,dragonfly package unix diff --git a/unix/ztypes_freebsd_386.go b/unix/ztypes_freebsd_386.go index 29dc4833..6cbd094a 100644 --- a/unix/ztypes_freebsd_386.go +++ b/unix/ztypes_freebsd_386.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build 386 && freebsd -// +build 386,freebsd package unix diff --git a/unix/ztypes_freebsd_amd64.go b/unix/ztypes_freebsd_amd64.go index 0a89b289..7c03b6ee 100644 --- a/unix/ztypes_freebsd_amd64.go +++ b/unix/ztypes_freebsd_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build amd64 && freebsd -// +build amd64,freebsd package unix diff --git a/unix/ztypes_freebsd_arm.go b/unix/ztypes_freebsd_arm.go index c8666bb1..422107ee 100644 --- a/unix/ztypes_freebsd_arm.go +++ b/unix/ztypes_freebsd_arm.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm && freebsd -// +build arm,freebsd package unix diff --git a/unix/ztypes_freebsd_arm64.go b/unix/ztypes_freebsd_arm64.go index 88fb48a8..505a12ac 100644 --- a/unix/ztypes_freebsd_arm64.go +++ b/unix/ztypes_freebsd_arm64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm64 && freebsd -// +build arm64,freebsd package unix diff --git a/unix/ztypes_freebsd_riscv64.go b/unix/ztypes_freebsd_riscv64.go index 698dc975..cc986c79 100644 --- a/unix/ztypes_freebsd_riscv64.go +++ b/unix/ztypes_freebsd_riscv64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build riscv64 && freebsd -// +build riscv64,freebsd package unix diff --git a/unix/ztypes_linux.go b/unix/ztypes_linux.go index cdba4c77..997bcd55 100644 --- a/unix/ztypes_linux.go +++ b/unix/ztypes_linux.go @@ -1,7 +1,6 @@ // Code generated by mkmerge; DO NOT EDIT. //go:build linux -// +build linux package unix diff --git a/unix/ztypes_linux_386.go b/unix/ztypes_linux_386.go index 6d8acbcc..438a30af 100644 --- a/unix/ztypes_linux_386.go +++ b/unix/ztypes_linux_386.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build 386 && linux -// +build 386,linux package unix diff --git a/unix/ztypes_linux_amd64.go b/unix/ztypes_linux_amd64.go index 59293c68..adceca35 100644 --- a/unix/ztypes_linux_amd64.go +++ b/unix/ztypes_linux_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build amd64 && linux -// +build amd64,linux package unix diff --git a/unix/ztypes_linux_arm.go b/unix/ztypes_linux_arm.go index 40cfa38c..eeaa00a3 100644 --- a/unix/ztypes_linux_arm.go +++ b/unix/ztypes_linux_arm.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm && linux -// +build arm,linux package unix diff --git a/unix/ztypes_linux_arm64.go b/unix/ztypes_linux_arm64.go index 055bc421..6739aa91 100644 --- a/unix/ztypes_linux_arm64.go +++ b/unix/ztypes_linux_arm64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm64 && linux -// +build arm64,linux package unix diff --git a/unix/ztypes_linux_loong64.go b/unix/ztypes_linux_loong64.go index f28affbc..9920ef63 100644 --- a/unix/ztypes_linux_loong64.go +++ b/unix/ztypes_linux_loong64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build loong64 && linux -// +build loong64,linux package unix diff --git a/unix/ztypes_linux_mips.go b/unix/ztypes_linux_mips.go index 9d71e7cc..2923b799 100644 --- a/unix/ztypes_linux_mips.go +++ b/unix/ztypes_linux_mips.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build mips && linux -// +build mips,linux package unix diff --git a/unix/ztypes_linux_mips64.go b/unix/ztypes_linux_mips64.go index fd5ccd33..ce2750ee 100644 --- a/unix/ztypes_linux_mips64.go +++ b/unix/ztypes_linux_mips64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build mips64 && linux -// +build mips64,linux package unix diff --git a/unix/ztypes_linux_mips64le.go b/unix/ztypes_linux_mips64le.go index 7704de77..3038811d 100644 --- a/unix/ztypes_linux_mips64le.go +++ b/unix/ztypes_linux_mips64le.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build mips64le && linux -// +build mips64le,linux package unix diff --git a/unix/ztypes_linux_mipsle.go b/unix/ztypes_linux_mipsle.go index df00b875..efc6fed1 100644 --- a/unix/ztypes_linux_mipsle.go +++ b/unix/ztypes_linux_mipsle.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build mipsle && linux -// +build mipsle,linux package unix diff --git a/unix/ztypes_linux_ppc.go b/unix/ztypes_linux_ppc.go index 0942840d..9a654b75 100644 --- a/unix/ztypes_linux_ppc.go +++ b/unix/ztypes_linux_ppc.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build ppc && linux -// +build ppc,linux package unix diff --git a/unix/ztypes_linux_ppc64.go b/unix/ztypes_linux_ppc64.go index 03487439..40d358e3 100644 --- a/unix/ztypes_linux_ppc64.go +++ b/unix/ztypes_linux_ppc64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build ppc64 && linux -// +build ppc64,linux package unix diff --git a/unix/ztypes_linux_ppc64le.go b/unix/ztypes_linux_ppc64le.go index bad06704..148c6ceb 100644 --- a/unix/ztypes_linux_ppc64le.go +++ b/unix/ztypes_linux_ppc64le.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build ppc64le && linux -// +build ppc64le,linux package unix diff --git a/unix/ztypes_linux_riscv64.go b/unix/ztypes_linux_riscv64.go index 1b4c97c3..72ba8154 100644 --- a/unix/ztypes_linux_riscv64.go +++ b/unix/ztypes_linux_riscv64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build riscv64 && linux -// +build riscv64,linux package unix diff --git a/unix/ztypes_linux_s390x.go b/unix/ztypes_linux_s390x.go index aa268d02..71e76550 100644 --- a/unix/ztypes_linux_s390x.go +++ b/unix/ztypes_linux_s390x.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build s390x && linux -// +build s390x,linux package unix diff --git a/unix/ztypes_linux_sparc64.go b/unix/ztypes_linux_sparc64.go index 444045b6..4abbdb9d 100644 --- a/unix/ztypes_linux_sparc64.go +++ b/unix/ztypes_linux_sparc64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build sparc64 && linux -// +build sparc64,linux package unix diff --git a/unix/ztypes_netbsd_386.go b/unix/ztypes_netbsd_386.go index 9bc4c8f9..f22e7947 100644 --- a/unix/ztypes_netbsd_386.go +++ b/unix/ztypes_netbsd_386.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build 386 && netbsd -// +build 386,netbsd package unix diff --git a/unix/ztypes_netbsd_amd64.go b/unix/ztypes_netbsd_amd64.go index bb05f655..066a7d83 100644 --- a/unix/ztypes_netbsd_amd64.go +++ b/unix/ztypes_netbsd_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build amd64 && netbsd -// +build amd64,netbsd package unix diff --git a/unix/ztypes_netbsd_arm.go b/unix/ztypes_netbsd_arm.go index db40e3a1..439548ec 100644 --- a/unix/ztypes_netbsd_arm.go +++ b/unix/ztypes_netbsd_arm.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm && netbsd -// +build arm,netbsd package unix diff --git a/unix/ztypes_netbsd_arm64.go b/unix/ztypes_netbsd_arm64.go index 11121151..16085d3b 100644 --- a/unix/ztypes_netbsd_arm64.go +++ b/unix/ztypes_netbsd_arm64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm64 && netbsd -// +build arm64,netbsd package unix diff --git a/unix/ztypes_openbsd_386.go b/unix/ztypes_openbsd_386.go index 26eba23b..afd13a3a 100644 --- a/unix/ztypes_openbsd_386.go +++ b/unix/ztypes_openbsd_386.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build 386 && openbsd -// +build 386,openbsd package unix diff --git a/unix/ztypes_openbsd_amd64.go b/unix/ztypes_openbsd_amd64.go index 5a547988..5d97f1f9 100644 --- a/unix/ztypes_openbsd_amd64.go +++ b/unix/ztypes_openbsd_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build amd64 && openbsd -// +build amd64,openbsd package unix diff --git a/unix/ztypes_openbsd_arm.go b/unix/ztypes_openbsd_arm.go index be58c4e1..34871cdc 100644 --- a/unix/ztypes_openbsd_arm.go +++ b/unix/ztypes_openbsd_arm.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm && openbsd -// +build arm,openbsd package unix diff --git a/unix/ztypes_openbsd_arm64.go b/unix/ztypes_openbsd_arm64.go index 52338266..5911bceb 100644 --- a/unix/ztypes_openbsd_arm64.go +++ b/unix/ztypes_openbsd_arm64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build arm64 && openbsd -// +build arm64,openbsd package unix diff --git a/unix/ztypes_openbsd_mips64.go b/unix/ztypes_openbsd_mips64.go index 605cfdb1..e4f24f3b 100644 --- a/unix/ztypes_openbsd_mips64.go +++ b/unix/ztypes_openbsd_mips64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build mips64 && openbsd -// +build mips64,openbsd package unix diff --git a/unix/ztypes_openbsd_ppc64.go b/unix/ztypes_openbsd_ppc64.go index d6724c01..ca50a793 100644 --- a/unix/ztypes_openbsd_ppc64.go +++ b/unix/ztypes_openbsd_ppc64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build ppc64 && openbsd -// +build ppc64,openbsd package unix diff --git a/unix/ztypes_openbsd_riscv64.go b/unix/ztypes_openbsd_riscv64.go index ddfd27a4..d7d7f790 100644 --- a/unix/ztypes_openbsd_riscv64.go +++ b/unix/ztypes_openbsd_riscv64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build riscv64 && openbsd -// +build riscv64,openbsd package unix diff --git a/unix/ztypes_solaris_amd64.go b/unix/ztypes_solaris_amd64.go index 0400747c..14160576 100644 --- a/unix/ztypes_solaris_amd64.go +++ b/unix/ztypes_solaris_amd64.go @@ -2,7 +2,6 @@ // Code generated by the command above; see README.md. DO NOT EDIT. //go:build amd64 && solaris -// +build amd64,solaris package unix diff --git a/unix/ztypes_zos_s390x.go b/unix/ztypes_zos_s390x.go index aec1efcb..54f31be6 100644 --- a/unix/ztypes_zos_s390x.go +++ b/unix/ztypes_zos_s390x.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build zos && s390x -// +build zos,s390x // Hand edited based on ztypes_linux_s390x.go // TODO: auto-generate. diff --git a/windows/aliases.go b/windows/aliases.go index a20ebea6..ce2d713d 100644 --- a/windows/aliases.go +++ b/windows/aliases.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows && go1.9 -// +build windows,go1.9 package windows diff --git a/windows/empty.s b/windows/empty.s index fdbbbcd3..ba64caca 100644 --- a/windows/empty.s +++ b/windows/empty.s @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build !go1.12 -// +build !go1.12 // This file is here to allow bodyless functions with go:linkname for Go 1.11 // and earlier (see https://golang.org/issue/23311). diff --git a/windows/eventlog.go b/windows/eventlog.go index 2cd60645..6c366955 100644 --- a/windows/eventlog.go +++ b/windows/eventlog.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package windows diff --git a/windows/mksyscall.go b/windows/mksyscall.go index 8563f79c..dbcdb090 100644 --- a/windows/mksyscall.go +++ b/windows/mksyscall.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build generate -// +build generate package windows diff --git a/windows/race.go b/windows/race.go index 9196b089..0f1bdc38 100644 --- a/windows/race.go +++ b/windows/race.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows && race -// +build windows,race package windows diff --git a/windows/race0.go b/windows/race0.go index 7bae4817..0c78da78 100644 --- a/windows/race0.go +++ b/windows/race0.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows && !race -// +build windows,!race package windows diff --git a/windows/registry/export_test.go b/windows/registry/export_test.go index d02d93f2..7f1ac70e 100644 --- a/windows/registry/export_test.go +++ b/windows/registry/export_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package registry diff --git a/windows/registry/key.go b/windows/registry/key.go index 6c8d97b6..fd863244 100644 --- a/windows/registry/key.go +++ b/windows/registry/key.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows // Package registry provides access to the Windows registry. // diff --git a/windows/registry/mksyscall.go b/windows/registry/mksyscall.go index ee74927d..bbf86ccf 100644 --- a/windows/registry/mksyscall.go +++ b/windows/registry/mksyscall.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build generate -// +build generate package registry diff --git a/windows/registry/registry_test.go b/windows/registry/registry_test.go index e2dd66fb..c227a5db 100644 --- a/windows/registry/registry_test.go +++ b/windows/registry/registry_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package registry_test diff --git a/windows/registry/syscall.go b/windows/registry/syscall.go index 41733512..f533091c 100644 --- a/windows/registry/syscall.go +++ b/windows/registry/syscall.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package registry diff --git a/windows/registry/value.go b/windows/registry/value.go index 2789f6f1..74db26b9 100644 --- a/windows/registry/value.go +++ b/windows/registry/value.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package registry diff --git a/windows/service.go b/windows/service.go index c44a1b96..a9dc6308 100644 --- a/windows/service.go +++ b/windows/service.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package windows diff --git a/windows/str.go b/windows/str.go index 4fc01434..6a4f9ce6 100644 --- a/windows/str.go +++ b/windows/str.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package windows diff --git a/windows/svc/debug/log.go b/windows/svc/debug/log.go index 6ee64ca8..e99d8317 100644 --- a/windows/svc/debug/log.go +++ b/windows/svc/debug/log.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package debug diff --git a/windows/svc/debug/service.go b/windows/svc/debug/service.go index 684c5dcb..bd1327e7 100644 --- a/windows/svc/debug/service.go +++ b/windows/svc/debug/service.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows // Package debug provides facilities to execute svc.Handler on console. package debug diff --git a/windows/svc/eventlog/install.go b/windows/svc/eventlog/install.go index 43e324f4..1179c38b 100644 --- a/windows/svc/eventlog/install.go +++ b/windows/svc/eventlog/install.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package eventlog diff --git a/windows/svc/eventlog/log.go b/windows/svc/eventlog/log.go index f37b4b51..f279444d 100644 --- a/windows/svc/eventlog/log.go +++ b/windows/svc/eventlog/log.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows // Package eventlog implements access to Windows event log. package eventlog diff --git a/windows/svc/eventlog/log_test.go b/windows/svc/eventlog/log_test.go index a667b8fb..79adc1a7 100644 --- a/windows/svc/eventlog/log_test.go +++ b/windows/svc/eventlog/log_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package eventlog_test diff --git a/windows/svc/example/beep.go b/windows/svc/example/beep.go index b454f593..18d5113c 100644 --- a/windows/svc/example/beep.go +++ b/windows/svc/example/beep.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package main diff --git a/windows/svc/example/install.go b/windows/svc/example/install.go index 4e9ac883..6394fc10 100644 --- a/windows/svc/example/install.go +++ b/windows/svc/example/install.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package main diff --git a/windows/svc/example/main.go b/windows/svc/example/main.go index 62f94702..f9786635 100644 --- a/windows/svc/example/main.go +++ b/windows/svc/example/main.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows // Example service program that beeps. // diff --git a/windows/svc/example/manage.go b/windows/svc/example/manage.go index 8ba3952a..be3556cb 100644 --- a/windows/svc/example/manage.go +++ b/windows/svc/example/manage.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package main diff --git a/windows/svc/example/service.go b/windows/svc/example/service.go index 08d54b51..373da64d 100644 --- a/windows/svc/example/service.go +++ b/windows/svc/example/service.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package main diff --git a/windows/svc/mgr/config.go b/windows/svc/mgr/config.go index 04554862..a6d3e8a8 100644 --- a/windows/svc/mgr/config.go +++ b/windows/svc/mgr/config.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package mgr diff --git a/windows/svc/mgr/mgr.go b/windows/svc/mgr/mgr.go index 4449161a..dbfd729f 100644 --- a/windows/svc/mgr/mgr.go +++ b/windows/svc/mgr/mgr.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows // Package mgr can be used to manage Windows service programs. // It can be used to install and remove them. It can also start, diff --git a/windows/svc/mgr/mgr_test.go b/windows/svc/mgr/mgr_test.go index 285dc10d..7741b117 100644 --- a/windows/svc/mgr/mgr_test.go +++ b/windows/svc/mgr/mgr_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package mgr_test diff --git a/windows/svc/mgr/recovery.go b/windows/svc/mgr/recovery.go index f7d13bbd..cdf880e1 100644 --- a/windows/svc/mgr/recovery.go +++ b/windows/svc/mgr/recovery.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package mgr diff --git a/windows/svc/mgr/service.go b/windows/svc/mgr/service.go index be3d151a..c9740ef0 100644 --- a/windows/svc/mgr/service.go +++ b/windows/svc/mgr/service.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package mgr diff --git a/windows/svc/security.go b/windows/svc/security.go index 1c51006e..6a1f3c62 100644 --- a/windows/svc/security.go +++ b/windows/svc/security.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package svc diff --git a/windows/svc/service.go b/windows/svc/service.go index e9e47f0b..c96932d9 100644 --- a/windows/svc/service.go +++ b/windows/svc/service.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows // Package svc provides everything required to build Windows service. package svc diff --git a/windows/svc/svc_test.go b/windows/svc/svc_test.go index 81161b85..be369ea2 100644 --- a/windows/svc/svc_test.go +++ b/windows/svc/svc_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package svc_test diff --git a/windows/syscall.go b/windows/syscall.go index 8732cdb9..e85ed6b9 100644 --- a/windows/syscall.go +++ b/windows/syscall.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows // Package windows contains an interface to the low-level operating system // primitives. OS details vary depending on the underlying system, and diff --git a/windows/syscall_test.go b/windows/syscall_test.go index fd4a0156..4b29fad5 100644 --- a/windows/syscall_test.go +++ b/windows/syscall_test.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package windows_test