Merge release-20210720.0-39-g964fb3ca7 (automated)

112 files changed, 187 insertions, 204 deletions

diff --git a/pkg/abi/abi_linux_state_autogen.go b/pkg/abi/abi_linux_state_autogen.go
index 327ef0e5c..8a1390439 100644
--- a/pkg/abi/abi_linux_state_autogen.go
+++ b/pkg/abi/abi_linux_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build linux
 // +build linux
 
 package abi
diff --git a/pkg/abi/linux/linux_abi_autogen_unsafe.go b/pkg/abi/linux/linux_abi_autogen_unsafe.go
index 29dadddbf..11cf350d2 100644
--- a/pkg/abi/linux/linux_abi_autogen_unsafe.go
+++ b/pkg/abi/linux/linux_abi_autogen_unsafe.go
@@ -1,11 +1,5 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
-// come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
-
 package linux
 
 import (
diff --git a/pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go b/pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go
index 1d479c196..770b19c2f 100644
--- a/pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go
+++ b/pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go
@@ -1,16 +1,13 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
+// If there are issues with build constraint aggregation, see
+// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here
 // come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
-
-// +build amd64
-// +build amd64
-// +build amd64
-// +build amd64
-// +build amd64
+// is filtered based on pre-defined file suffixes related to build constraints,
+// see tools/defs.bzl:calculate_sets().
+
+//go:build amd64 && amd64 && amd64 && amd64 && amd64
+// +build amd64,amd64,amd64,amd64,amd64
 
 package linux
 
diff --git a/pkg/abi/linux/linux_amd64_state_autogen.go b/pkg/abi/linux/linux_amd64_state_autogen.go
index d233a69df..b824c1dd9 100644
--- a/pkg/abi/linux/linux_amd64_state_autogen.go
+++ b/pkg/abi/linux/linux_amd64_state_autogen.go
@@ -1,10 +1,7 @@
 // automatically generated by stateify.
 
-// +build amd64
-// +build amd64
-// +build amd64
-// +build amd64
-// +build amd64
+//go:build amd64 && amd64 && amd64 && amd64 && amd64
+// +build amd64,amd64,amd64,amd64,amd64
 
 package linux
 
diff --git a/pkg/abi/linux/linux_arm64_abi_autogen_unsafe.go b/pkg/abi/linux/linux_arm64_abi_autogen_unsafe.go
index db4980c14..06c2aec98 100644
--- a/pkg/abi/linux/linux_arm64_abi_autogen_unsafe.go
+++ b/pkg/abi/linux/linux_arm64_abi_autogen_unsafe.go
@@ -1,15 +1,13 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
+// If there are issues with build constraint aggregation, see
+// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here
 // come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
+// is filtered based on pre-defined file suffixes related to build constraints,
+// see tools/defs.bzl:calculate_sets().
 
-// +build arm64
-// +build arm64
-// +build arm64
-// +build arm64
+//go:build arm64 && arm64 && arm64 && arm64
+// +build arm64,arm64,arm64,arm64
 
 package linux
 
diff --git a/pkg/abi/linux/linux_arm64_state_autogen.go b/pkg/abi/linux/linux_arm64_state_autogen.go
index 8b08b2925..1994658e5 100644
--- a/pkg/abi/linux/linux_arm64_state_autogen.go
+++ b/pkg/abi/linux/linux_arm64_state_autogen.go
@@ -1,9 +1,7 @@
 // automatically generated by stateify.
 
-// +build arm64
-// +build arm64
-// +build arm64
-// +build arm64
+//go:build arm64 && arm64 && arm64 && arm64
+// +build arm64,arm64,arm64,arm64
 
 package linux
 
diff --git a/pkg/atomicbitops/atomicbitops_32bit_unsafe_state_autogen.go b/pkg/atomicbitops/atomicbitops_32bit_unsafe_state_autogen.go
index ae32b0c59..f31fa264b 100644
--- a/pkg/atomicbitops/atomicbitops_32bit_unsafe_state_autogen.go
+++ b/pkg/atomicbitops/atomicbitops_32bit_unsafe_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build arm || mips || 386
 // +build arm mips 386
 
 package atomicbitops
diff --git a/pkg/atomicbitops/atomicbitops_64bit_state_autogen.go b/pkg/atomicbitops/atomicbitops_64bit_state_autogen.go
index a084f4c57..b21caab17 100644
--- a/pkg/atomicbitops/atomicbitops_64bit_state_autogen.go
+++ b/pkg/atomicbitops/atomicbitops_64bit_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build !arm && !mips && !386
 // +build !arm,!mips,!386
 
 package atomicbitops
diff --git a/pkg/atomicbitops/atomicbitops_state_autogen.go b/pkg/atomicbitops/atomicbitops_state_autogen.go
index 06fcf712a..676d44439 100644
--- a/pkg/atomicbitops/atomicbitops_state_autogen.go
+++ b/pkg/atomicbitops/atomicbitops_state_autogen.go
@@ -1,6 +1,8 @@
 // automatically generated by stateify.
 
+//go:build (amd64 || arm64) && !amd64 && !arm64
 // +build amd64 arm64
-// +build !amd64,!arm64
+// +build !amd64
+// +build !arm64
 
 package atomicbitops
diff --git a/pkg/bits/bits_state_autogen.go b/pkg/bits/bits_state_autogen.go
index 22b8250c6..436c111bd 100644
--- a/pkg/bits/bits_state_autogen.go
+++ b/pkg/bits/bits_state_autogen.go
@@ -1,6 +1,8 @@
 // automatically generated by stateify.
 
+//go:build (amd64 || arm64) && !amd64 && !arm64
 // +build amd64 arm64
-// +build !amd64,!arm64
+// +build !amd64
+// +build !arm64
 
 package bits
diff --git a/pkg/coverage/coverage_state_autogen.go b/pkg/coverage/coverage_state_autogen.go
index 669eb89b2..8ed6850af 100644
--- a/pkg/coverage/coverage_state_autogen.go
+++ b/pkg/coverage/coverage_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build go1.1
 // +build go1.1
 
 package coverage
diff --git a/pkg/cpuid/cpuid_arm64_state_autogen.go b/pkg/cpuid/cpuid_arm64_state_autogen.go
index 50e317963..eb91e6d97 100644
--- a/pkg/cpuid/cpuid_arm64_state_autogen.go
+++ b/pkg/cpuid/cpuid_arm64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build arm64
 // +build arm64
 
 package cpuid
diff --git a/pkg/cpuid/cpuid_x86_state_autogen.go b/pkg/cpuid/cpuid_x86_state_autogen.go
index 9962a29ae..ec639ae38 100644
--- a/pkg/cpuid/cpuid_x86_state_autogen.go
+++ b/pkg/cpuid/cpuid_x86_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build 386 || amd64
 // +build 386 amd64
 
 package cpuid
diff --git a/pkg/eventchannel/eventchannel_state_autogen.go b/pkg/eventchannel/eventchannel_state_autogen.go
index ccbae06f5..d6ace927f 100644
--- a/pkg/eventchannel/eventchannel_state_autogen.go
+++ b/pkg/eventchannel/eventchannel_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build go1.1
 // +build go1.1
 
 package eventchannel
diff --git a/pkg/fdchannel/fdchannel_unsafe_state_autogen.go b/pkg/fdchannel/fdchannel_unsafe_state_autogen.go
index 61447d773..6ad5b7b43 100644
--- a/pkg/fdchannel/fdchannel_unsafe_state_autogen.go
+++ b/pkg/fdchannel/fdchannel_unsafe_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
 // +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package fdchannel
diff --git a/pkg/fdnotifier/fdnotifier_state_autogen.go b/pkg/fdnotifier/fdnotifier_state_autogen.go
index 527d44091..70dfa86d3 100644
--- a/pkg/fdnotifier/fdnotifier_state_autogen.go
+++ b/pkg/fdnotifier/fdnotifier_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build linux
 // +build linux
 
 package fdnotifier
diff --git a/pkg/fdnotifier/fdnotifier_unsafe_state_autogen.go b/pkg/fdnotifier/fdnotifier_unsafe_state_autogen.go
index 527d44091..70dfa86d3 100644
--- a/pkg/fdnotifier/fdnotifier_unsafe_state_autogen.go
+++ b/pkg/fdnotifier/fdnotifier_unsafe_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build linux
 // +build linux
 
 package fdnotifier
diff --git a/pkg/flipcall/flipcall_linux_state_autogen.go b/pkg/flipcall/flipcall_linux_state_autogen.go
index ce37ac4e1..7c9d0e9db 100644
--- a/pkg/flipcall/flipcall_linux_state_autogen.go
+++ b/pkg/flipcall/flipcall_linux_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build linux
 // +build linux
 
 package flipcall
diff --git a/pkg/flipcall/flipcall_state_autogen.go b/pkg/flipcall/flipcall_state_autogen.go
index 0078f96e3..0557f3660 100644
--- a/pkg/flipcall/flipcall_state_autogen.go
+++ b/pkg/flipcall/flipcall_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build go1.1
 // +build go1.1
 
 package flipcall
diff --git a/pkg/hostarch/hostarch_arm64_state_autogen.go b/pkg/hostarch/hostarch_arm64_state_autogen.go
index ca13bb4d4..444542b30 100644
--- a/pkg/hostarch/hostarch_arm64_state_autogen.go
+++ b/pkg/hostarch/hostarch_arm64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build arm64
 // +build arm64
 
 package hostarch
diff --git a/pkg/hostarch/hostarch_x86_state_autogen.go b/pkg/hostarch/hostarch_x86_state_autogen.go
index 98bb9050d..239b6ba6c 100644
--- a/pkg/hostarch/hostarch_x86_state_autogen.go
+++ b/pkg/hostarch/hostarch_x86_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build amd64 || 386
 // +build amd64 386
 
 package hostarch
diff --git a/pkg/marshal/primitive/primitive_abi_autogen_unsafe.go b/pkg/marshal/primitive/primitive_abi_autogen_unsafe.go
index 4ccc2a8c8..51e9e7144 100644
--- a/pkg/marshal/primitive/primitive_abi_autogen_unsafe.go
+++ b/pkg/marshal/primitive/primitive_abi_autogen_unsafe.go
@@ -1,11 +1,5 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
-// come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
-
 package primitive
 
 import (
diff --git a/pkg/memutil/memutil_linux_unsafe_state_autogen.go b/pkg/memutil/memutil_linux_unsafe_state_autogen.go
index 173297149..df954e7f4 100644
--- a/pkg/memutil/memutil_linux_unsafe_state_autogen.go
+++ b/pkg/memutil/memutil_linux_unsafe_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build linux
 // +build linux
 
 package memutil
diff --git a/pkg/memutil/memutil_state_autogen.go b/pkg/memutil/memutil_state_autogen.go
index 4aa01530c..7e42b8f81 100644
--- a/pkg/memutil/memutil_state_autogen.go
+++ b/pkg/memutil/memutil_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build go1.1
 // +build go1.1
 
 package memutil
diff --git a/pkg/procid/procid_state_autogen.go b/pkg/procid/procid_state_autogen.go
index 59cb991c0..be58e2904 100644
--- a/pkg/procid/procid_state_autogen.go
+++ b/pkg/procid/procid_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build go1.1
 // +build go1.1
 
 package procid
diff --git a/pkg/rand/rand_state_autogen.go b/pkg/rand/rand_state_autogen.go
index e0a5cd184..4320837d6 100644
--- a/pkg/rand/rand_state_autogen.go
+++ b/pkg/rand/rand_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build !linux
 // +build !linux
 
 package rand
diff --git a/pkg/ring0/defs_impl_amd64.go b/pkg/ring0/defs_impl_amd64.go
index 97d13e682..d22b41549 100644
--- a/pkg/ring0/defs_impl_amd64.go
+++ b/pkg/ring0/defs_impl_amd64.go
@@ -1,3 +1,4 @@
+//go:build amd64 && amd64 && (386 || amd64)
 // +build amd64
 // +build amd64
 // +build 386 amd64
diff --git a/pkg/ring0/defs_impl_arm64.go b/pkg/ring0/defs_impl_arm64.go
index 90f6af9fc..c3c543c88 100644
--- a/pkg/ring0/defs_impl_arm64.go
+++ b/pkg/ring0/defs_impl_arm64.go
@@ -1,6 +1,5 @@
-// +build arm64
-// +build arm64
-// +build arm64
+//go:build arm64 && arm64 && arm64
+// +build arm64,arm64,arm64
 
 package ring0
 
diff --git a/pkg/ring0/pagetables/pagetables_aarch64_state_autogen.go b/pkg/ring0/pagetables/pagetables_aarch64_state_autogen.go
index a24523f87..e395f6e5e 100644
--- a/pkg/ring0/pagetables/pagetables_aarch64_state_autogen.go
+++ b/pkg/ring0/pagetables/pagetables_aarch64_state_autogen.go
@@ -1,6 +1,6 @@
 // automatically generated by stateify.
 
-// +build arm64
-// +build arm64
+//go:build arm64 && arm64
+// +build arm64,arm64
 
 package pagetables
diff --git a/pkg/ring0/pagetables/pagetables_amd64_state_autogen.go b/pkg/ring0/pagetables/pagetables_amd64_state_autogen.go
index f48a8acd1..50f7f3fb1 100644
--- a/pkg/ring0/pagetables/pagetables_amd64_state_autogen.go
+++ b/pkg/ring0/pagetables/pagetables_amd64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build amd64
 // +build amd64
 
 package pagetables
diff --git a/pkg/ring0/pagetables/pagetables_arm64_state_autogen.go b/pkg/ring0/pagetables/pagetables_arm64_state_autogen.go
index ae9d2b272..83bdb8f3c 100644
--- a/pkg/ring0/pagetables/pagetables_arm64_state_autogen.go
+++ b/pkg/ring0/pagetables/pagetables_arm64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build arm64
 // +build arm64
 
 package pagetables
diff --git a/pkg/ring0/pagetables/pagetables_x86_state_autogen.go b/pkg/ring0/pagetables/pagetables_x86_state_autogen.go
index 6fe78c51c..36d1fad72 100644
--- a/pkg/ring0/pagetables/pagetables_x86_state_autogen.go
+++ b/pkg/ring0/pagetables/pagetables_x86_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build (386 || amd64) && (i386 || amd64)
 // +build 386 amd64
 // +build i386 amd64
 
diff --git a/pkg/ring0/pagetables/walker_empty_amd64.go b/pkg/ring0/pagetables/walker_empty_amd64.go
index a3cd7a1a2..5a6ac02eb 100644
--- a/pkg/ring0/pagetables/walker_empty_amd64.go
+++ b/pkg/ring0/pagetables/walker_empty_amd64.go
@@ -1,3 +1,4 @@
+//go:build amd64
 // +build amd64
 
 package pagetables
diff --git a/pkg/ring0/pagetables/walker_empty_arm64.go b/pkg/ring0/pagetables/walker_empty_arm64.go
index d61b44b65..3ab92f0ec 100644
--- a/pkg/ring0/pagetables/walker_empty_arm64.go
+++ b/pkg/ring0/pagetables/walker_empty_arm64.go
@@ -1,3 +1,4 @@
+//go:build arm64
 // +build arm64
 
 package pagetables
diff --git a/pkg/ring0/pagetables/walker_lookup_amd64.go b/pkg/ring0/pagetables/walker_lookup_amd64.go
index c92c1cb44..ad0cb8bb4 100644
--- a/pkg/ring0/pagetables/walker_lookup_amd64.go
+++ b/pkg/ring0/pagetables/walker_lookup_amd64.go
@@ -1,3 +1,4 @@
+//go:build amd64
 // +build amd64
 
 package pagetables
diff --git a/pkg/ring0/pagetables/walker_lookup_arm64.go b/pkg/ring0/pagetables/walker_lookup_arm64.go
index 74062a00a..2b989b3f1 100644
--- a/pkg/ring0/pagetables/walker_lookup_arm64.go
+++ b/pkg/ring0/pagetables/walker_lookup_arm64.go
@@ -1,3 +1,4 @@
+//go:build arm64
 // +build arm64
 
 package pagetables
diff --git a/pkg/ring0/pagetables/walker_map_amd64.go b/pkg/ring0/pagetables/walker_map_amd64.go
index 1c6c1a032..4e0b959a5 100644
--- a/pkg/ring0/pagetables/walker_map_amd64.go
+++ b/pkg/ring0/pagetables/walker_map_amd64.go
@@ -1,3 +1,4 @@
+//go:build amd64
 // +build amd64
 
 package pagetables
diff --git a/pkg/ring0/pagetables/walker_map_arm64.go b/pkg/ring0/pagetables/walker_map_arm64.go
index 8223de306..6d70b7091 100644
--- a/pkg/ring0/pagetables/walker_map_arm64.go
+++ b/pkg/ring0/pagetables/walker_map_arm64.go
@@ -1,3 +1,4 @@
+//go:build arm64
 // +build arm64
 
 package pagetables
diff --git a/pkg/ring0/pagetables/walker_unmap_amd64.go b/pkg/ring0/pagetables/walker_unmap_amd64.go
index 82b27ab64..25d3a1710 100644
--- a/pkg/ring0/pagetables/walker_unmap_amd64.go
+++ b/pkg/ring0/pagetables/walker_unmap_amd64.go
@@ -1,3 +1,4 @@
+//go:build amd64
 // +build amd64
 
 package pagetables
diff --git a/pkg/ring0/pagetables/walker_unmap_arm64.go b/pkg/ring0/pagetables/walker_unmap_arm64.go
index 1ecccbf27..7ad732e39 100644
--- a/pkg/ring0/pagetables/walker_unmap_arm64.go
+++ b/pkg/ring0/pagetables/walker_unmap_arm64.go
@@ -1,3 +1,4 @@
+//go:build arm64
 // +build arm64
 
 package pagetables
diff --git a/pkg/ring0/ring0_amd64_state_autogen.go b/pkg/ring0/ring0_amd64_state_autogen.go
index 96cf5d331..2bd773254 100644
--- a/pkg/ring0/ring0_amd64_state_autogen.go
+++ b/pkg/ring0/ring0_amd64_state_autogen.go
@@ -1,7 +1,6 @@
 // automatically generated by stateify.
 
-// +build amd64
-// +build amd64
-// +build amd64
+//go:build amd64 && amd64 && amd64
+// +build amd64,amd64,amd64
 
 package ring0
diff --git a/pkg/ring0/ring0_arm64_state_autogen.go b/pkg/ring0/ring0_arm64_state_autogen.go
index 7f2ab3537..d87b068ec 100644
--- a/pkg/ring0/ring0_arm64_state_autogen.go
+++ b/pkg/ring0/ring0_arm64_state_autogen.go
@@ -1,7 +1,6 @@
 // automatically generated by stateify.
 
-// +build arm64
-// +build arm64
-// +build arm64
+//go:build arm64 && arm64 && arm64
+// +build arm64,arm64,arm64
 
 package ring0
diff --git a/pkg/ring0/ring0_impl_amd64_state_autogen.go b/pkg/ring0/ring0_impl_amd64_state_autogen.go
index 770a13dfa..81a3dd14f 100644
--- a/pkg/ring0/ring0_impl_amd64_state_autogen.go
+++ b/pkg/ring0/ring0_impl_amd64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build amd64 && amd64 && (386 || amd64)
 // +build amd64
 // +build amd64
 // +build 386 amd64
diff --git a/pkg/ring0/ring0_impl_arm64_state_autogen.go b/pkg/ring0/ring0_impl_arm64_state_autogen.go
index 7f2ab3537..d87b068ec 100644
--- a/pkg/ring0/ring0_impl_arm64_state_autogen.go
+++ b/pkg/ring0/ring0_impl_arm64_state_autogen.go
@@ -1,7 +1,6 @@
 // automatically generated by stateify.
 
-// +build arm64
-// +build arm64
-// +build arm64
+//go:build arm64 && arm64 && arm64
+// +build arm64,arm64,arm64
 
 package ring0
diff --git a/pkg/seccomp/seccomp_amd64_state_autogen.go b/pkg/seccomp/seccomp_amd64_state_autogen.go
index 27a96018b..6c95fd6fb 100644
--- a/pkg/seccomp/seccomp_amd64_state_autogen.go
+++ b/pkg/seccomp/seccomp_amd64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build amd64
 // +build amd64
 
 package seccomp
diff --git a/pkg/seccomp/seccomp_arm64_state_autogen.go b/pkg/seccomp/seccomp_arm64_state_autogen.go
index 96c64c23d..e6f1039cd 100644
--- a/pkg/seccomp/seccomp_arm64_state_autogen.go
+++ b/pkg/seccomp/seccomp_arm64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build arm64
 // +build arm64
 
 package seccomp
diff --git a/pkg/sentry/arch/arch_aarch64_abi_autogen_unsafe.go b/pkg/sentry/arch/arch_aarch64_abi_autogen_unsafe.go
index 7d3405576..0a1eae844 100644
--- a/pkg/sentry/arch/arch_aarch64_abi_autogen_unsafe.go
+++ b/pkg/sentry/arch/arch_aarch64_abi_autogen_unsafe.go
@@ -1,11 +1,12 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
+// If there are issues with build constraint aggregation, see
+// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here
 // come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
+// is filtered based on pre-defined file suffixes related to build constraints,
+// see tools/defs.bzl:calculate_sets().
 
+//go:build arm64
 // +build arm64
 
 package arch
diff --git a/pkg/sentry/arch/arch_aarch64_state_autogen.go b/pkg/sentry/arch/arch_aarch64_state_autogen.go
index 0463c0125..6faaa9f08 100644
--- a/pkg/sentry/arch/arch_aarch64_state_autogen.go
+++ b/pkg/sentry/arch/arch_aarch64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build arm64
 // +build arm64
 
 package arch
diff --git a/pkg/sentry/arch/arch_abi_autogen_unsafe.go b/pkg/sentry/arch/arch_abi_autogen_unsafe.go
index 2237dde67..2167ed9c9 100644
--- a/pkg/sentry/arch/arch_abi_autogen_unsafe.go
+++ b/pkg/sentry/arch/arch_abi_autogen_unsafe.go
@@ -1,11 +1,5 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
-// come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
-
 package arch
 
 import (
diff --git a/pkg/sentry/arch/arch_amd64_abi_autogen_unsafe.go b/pkg/sentry/arch/arch_amd64_abi_autogen_unsafe.go
index dc203ca63..dd850b1b8 100644
--- a/pkg/sentry/arch/arch_amd64_abi_autogen_unsafe.go
+++ b/pkg/sentry/arch/arch_amd64_abi_autogen_unsafe.go
@@ -1,14 +1,13 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
+// If there are issues with build constraint aggregation, see
+// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here
 // come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
+// is filtered based on pre-defined file suffixes related to build constraints,
+// see tools/defs.bzl:calculate_sets().
 
-// +build amd64
-// +build amd64
-// +build amd64
+//go:build amd64 && amd64 && amd64
+// +build amd64,amd64,amd64
 
 package arch
 
diff --git a/pkg/sentry/arch/arch_amd64_state_autogen.go b/pkg/sentry/arch/arch_amd64_state_autogen.go
index d74b4267b..501572f2c 100644
--- a/pkg/sentry/arch/arch_amd64_state_autogen.go
+++ b/pkg/sentry/arch/arch_amd64_state_autogen.go
@@ -1,8 +1,7 @@
 // automatically generated by stateify.
 
-// +build amd64
-// +build amd64
-// +build amd64
+//go:build amd64 && amd64 && amd64
+// +build amd64,amd64,amd64
 
 package arch
 
diff --git a/pkg/sentry/arch/arch_arm64_abi_autogen_unsafe.go b/pkg/sentry/arch/arch_arm64_abi_autogen_unsafe.go
index c17ced511..52ca0b185 100644
--- a/pkg/sentry/arch/arch_arm64_abi_autogen_unsafe.go
+++ b/pkg/sentry/arch/arch_arm64_abi_autogen_unsafe.go
@@ -1,14 +1,13 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
+// If there are issues with build constraint aggregation, see
+// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here
 // come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
+// is filtered based on pre-defined file suffixes related to build constraints,
+// see tools/defs.bzl:calculate_sets().
 
-// +build arm64
-// +build arm64
-// +build arm64
+//go:build arm64 && arm64 && arm64
+// +build arm64,arm64,arm64
 
 package arch
 
diff --git a/pkg/sentry/arch/arch_arm64_state_autogen.go b/pkg/sentry/arch/arch_arm64_state_autogen.go
index 4f6fe0744..45bfbfca1 100644
--- a/pkg/sentry/arch/arch_arm64_state_autogen.go
+++ b/pkg/sentry/arch/arch_arm64_state_autogen.go
@@ -1,8 +1,7 @@
 // automatically generated by stateify.
 
-// +build arm64
-// +build arm64
-// +build arm64
+//go:build arm64 && arm64 && arm64
+// +build arm64,arm64,arm64
 
 package arch
 
diff --git a/pkg/sentry/arch/arch_unsafe_abi_autogen_unsafe.go b/pkg/sentry/arch/arch_unsafe_abi_autogen_unsafe.go
index 2237dde67..2167ed9c9 100644
--- a/pkg/sentry/arch/arch_unsafe_abi_autogen_unsafe.go
+++ b/pkg/sentry/arch/arch_unsafe_abi_autogen_unsafe.go
@@ -1,11 +1,5 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
-// come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
-
 package arch
 
 import (
diff --git a/pkg/sentry/arch/arch_x86_abi_autogen_unsafe.go b/pkg/sentry/arch/arch_x86_abi_autogen_unsafe.go
index f0ec25e8d..97a463c9f 100644
--- a/pkg/sentry/arch/arch_x86_abi_autogen_unsafe.go
+++ b/pkg/sentry/arch/arch_x86_abi_autogen_unsafe.go
@@ -1,11 +1,12 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
+// If there are issues with build constraint aggregation, see
+// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here
 // come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
+// is filtered based on pre-defined file suffixes related to build constraints,
+// see tools/defs.bzl:calculate_sets().
 
+//go:build (amd64 || 386) && (amd64 || 386)
 // +build amd64 386
 // +build amd64 386
 
diff --git a/pkg/sentry/arch/arch_x86_impl_abi_autogen_unsafe.go b/pkg/sentry/arch/arch_x86_impl_abi_autogen_unsafe.go
index f1968e054..2b2c59d95 100644
--- a/pkg/sentry/arch/arch_x86_impl_abi_autogen_unsafe.go
+++ b/pkg/sentry/arch/arch_x86_impl_abi_autogen_unsafe.go
@@ -1,11 +1,12 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
+// If there are issues with build constraint aggregation, see
+// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here
 // come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
+// is filtered based on pre-defined file suffixes related to build constraints,
+// see tools/defs.bzl:calculate_sets().
 
+//go:build (amd64 || 386) && go1.1
 // +build amd64 386
 // +build go1.1
 
diff --git a/pkg/sentry/arch/arch_x86_impl_state_autogen.go b/pkg/sentry/arch/arch_x86_impl_state_autogen.go
index 1865a64dd..edcc2bee5 100644
--- a/pkg/sentry/arch/arch_x86_impl_state_autogen.go
+++ b/pkg/sentry/arch/arch_x86_impl_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build (amd64 || 386) && go1.1
 // +build amd64 386
 // +build go1.1
 
diff --git a/pkg/sentry/arch/arch_x86_state_autogen.go b/pkg/sentry/arch/arch_x86_state_autogen.go
index 7584e42c5..7785fb645 100644
--- a/pkg/sentry/arch/arch_x86_state_autogen.go
+++ b/pkg/sentry/arch/arch_x86_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build (amd64 || 386) && (amd64 || 386)
 // +build amd64 386
 // +build amd64 386
 
diff --git a/pkg/sentry/arch/fpu/fpu_amd64_state_autogen.go b/pkg/sentry/arch/fpu/fpu_amd64_state_autogen.go
index 38db6e6f4..d31975f85 100644
--- a/pkg/sentry/arch/fpu/fpu_amd64_state_autogen.go
+++ b/pkg/sentry/arch/fpu/fpu_amd64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build amd64 || i386
 // +build amd64 i386
 
 package fpu
diff --git a/pkg/sentry/arch/fpu/fpu_arm64_state_autogen.go b/pkg/sentry/arch/fpu/fpu_arm64_state_autogen.go
index cb7d1ca8a..7b28aba81 100644
--- a/pkg/sentry/arch/fpu/fpu_arm64_state_autogen.go
+++ b/pkg/sentry/arch/fpu/fpu_arm64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build arm64
 // +build arm64
 
 package fpu
diff --git a/pkg/sentry/fs/host/host_amd64_unsafe_state_autogen.go b/pkg/sentry/fs/host/host_amd64_unsafe_state_autogen.go
index 488cbdfcf..14cecc49f 100644
--- a/pkg/sentry/fs/host/host_amd64_unsafe_state_autogen.go
+++ b/pkg/sentry/fs/host/host_amd64_unsafe_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build amd64
 // +build amd64
 
 package host
diff --git a/pkg/sentry/fs/host/host_arm64_unsafe_state_autogen.go b/pkg/sentry/fs/host/host_arm64_unsafe_state_autogen.go
index 7371b44db..a714e619e 100644
--- a/pkg/sentry/fs/host/host_arm64_unsafe_state_autogen.go
+++ b/pkg/sentry/fs/host/host_arm64_unsafe_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build arm64
 // +build arm64
 
 package host
diff --git a/pkg/sentry/hostfd/hostfd_linux_state_autogen.go b/pkg/sentry/hostfd/hostfd_linux_state_autogen.go
index 256bf270a..24e7ba400 100644
--- a/pkg/sentry/hostfd/hostfd_linux_state_autogen.go
+++ b/pkg/sentry/hostfd/hostfd_linux_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build go1.1
 // +build go1.1
 
 package hostfd
diff --git a/pkg/sentry/kernel/auth/auth_abi_autogen_unsafe.go b/pkg/sentry/kernel/auth/auth_abi_autogen_unsafe.go
index 8ec71bc50..393dcea8c 100644
--- a/pkg/sentry/kernel/auth/auth_abi_autogen_unsafe.go
+++ b/pkg/sentry/kernel/auth/auth_abi_autogen_unsafe.go
@@ -1,11 +1,5 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
-// come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
-
 package auth
 
 import (
diff --git a/pkg/sentry/kernel/auth/auth_unsafe_abi_autogen_unsafe.go b/pkg/sentry/kernel/auth/auth_unsafe_abi_autogen_unsafe.go
index 7f4cbed94..ebcd3911b 100644
--- a/pkg/sentry/kernel/auth/auth_unsafe_abi_autogen_unsafe.go
+++ b/pkg/sentry/kernel/auth/auth_unsafe_abi_autogen_unsafe.go
@@ -1,11 +1,5 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
-// come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
-
 package auth
 
 import (
diff --git a/pkg/sentry/kernel/kernel_abi_autogen_unsafe.go b/pkg/sentry/kernel/kernel_abi_autogen_unsafe.go
index f951fab78..83ed0f8ac 100644
--- a/pkg/sentry/kernel/kernel_abi_autogen_unsafe.go
+++ b/pkg/sentry/kernel/kernel_abi_autogen_unsafe.go
@@ -1,11 +1,5 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
-// come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
-
 package kernel
 
 import (
diff --git a/pkg/sentry/kernel/kernel_amd64_abi_autogen_unsafe.go b/pkg/sentry/kernel/kernel_amd64_abi_autogen_unsafe.go
index 49bde618c..988351acf 100644
--- a/pkg/sentry/kernel/kernel_amd64_abi_autogen_unsafe.go
+++ b/pkg/sentry/kernel/kernel_amd64_abi_autogen_unsafe.go
@@ -1,11 +1,12 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
+// If there are issues with build constraint aggregation, see
+// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here
 // come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
+// is filtered based on pre-defined file suffixes related to build constraints,
+// see tools/defs.bzl:calculate_sets().
 
+//go:build amd64
 // +build amd64
 
 package kernel
diff --git a/pkg/sentry/kernel/kernel_amd64_state_autogen.go b/pkg/sentry/kernel/kernel_amd64_state_autogen.go
index 12de47ad0..859999676 100644
--- a/pkg/sentry/kernel/kernel_amd64_state_autogen.go
+++ b/pkg/sentry/kernel/kernel_amd64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build amd64
 // +build amd64
 
 package kernel
diff --git a/pkg/sentry/kernel/kernel_arm64_abi_autogen_unsafe.go b/pkg/sentry/kernel/kernel_arm64_abi_autogen_unsafe.go
index ed40b65c6..823d08b19 100644
--- a/pkg/sentry/kernel/kernel_arm64_abi_autogen_unsafe.go
+++ b/pkg/sentry/kernel/kernel_arm64_abi_autogen_unsafe.go
@@ -1,11 +1,12 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
+// If there are issues with build constraint aggregation, see
+// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here
 // come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
+// is filtered based on pre-defined file suffixes related to build constraints,
+// see tools/defs.bzl:calculate_sets().
 
+//go:build arm64
 // +build arm64
 
 package kernel
diff --git a/pkg/sentry/kernel/kernel_arm64_state_autogen.go b/pkg/sentry/kernel/kernel_arm64_state_autogen.go
index 3c040d283..7340674a6 100644
--- a/pkg/sentry/kernel/kernel_arm64_state_autogen.go
+++ b/pkg/sentry/kernel/kernel_arm64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build arm64
 // +build arm64
 
 package kernel
diff --git a/pkg/sentry/kernel/kernel_opts_abi_autogen_unsafe.go b/pkg/sentry/kernel/kernel_opts_abi_autogen_unsafe.go
index 3e0693a12..dcca4b9dd 100644
--- a/pkg/sentry/kernel/kernel_opts_abi_autogen_unsafe.go
+++ b/pkg/sentry/kernel/kernel_opts_abi_autogen_unsafe.go
@@ -1,11 +1,12 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
+// If there are issues with build constraint aggregation, see
+// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here
 // come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
+// is filtered based on pre-defined file suffixes related to build constraints,
+// see tools/defs.bzl:calculate_sets().
 
+//go:build go1.1
 // +build go1.1
 
 package kernel
diff --git a/pkg/sentry/kernel/kernel_opts_state_autogen.go b/pkg/sentry/kernel/kernel_opts_state_autogen.go
index 3a027c5ed..d878d9a06 100644
--- a/pkg/sentry/kernel/kernel_opts_state_autogen.go
+++ b/pkg/sentry/kernel/kernel_opts_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build go1.1
 // +build go1.1
 
 package kernel
diff --git a/pkg/sentry/kernel/kernel_unsafe_abi_autogen_unsafe.go b/pkg/sentry/kernel/kernel_unsafe_abi_autogen_unsafe.go
index 9c39d630a..5d810c89c 100644
--- a/pkg/sentry/kernel/kernel_unsafe_abi_autogen_unsafe.go
+++ b/pkg/sentry/kernel/kernel_unsafe_abi_autogen_unsafe.go
@@ -1,11 +1,5 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
-// come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
-
 package kernel
 
 import (
diff --git a/pkg/sentry/loader/loader_abi_autogen_unsafe.go b/pkg/sentry/loader/loader_abi_autogen_unsafe.go
index bfa048912..618cb60fc 100644
--- a/pkg/sentry/loader/loader_abi_autogen_unsafe.go
+++ b/pkg/sentry/loader/loader_abi_autogen_unsafe.go
@@ -1,11 +1,5 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
-// come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
-
 package loader
 
 import (
diff --git a/pkg/sentry/platform/kvm/kvm_amd64_state_autogen.go b/pkg/sentry/platform/kvm/kvm_amd64_state_autogen.go
index a69cbee8b..1bc956971 100644
--- a/pkg/sentry/platform/kvm/kvm_amd64_state_autogen.go
+++ b/pkg/sentry/platform/kvm/kvm_amd64_state_autogen.go
@@ -1,7 +1,6 @@
 // automatically generated by stateify.
 
-// +build amd64
-// +build amd64
-// +build amd64
+//go:build amd64 && amd64 && amd64
+// +build amd64,amd64,amd64
 
 package kvm
diff --git a/pkg/sentry/platform/kvm/kvm_amd64_unsafe_state_autogen.go b/pkg/sentry/platform/kvm/kvm_amd64_unsafe_state_autogen.go
index a69cbee8b..1bc956971 100644
--- a/pkg/sentry/platform/kvm/kvm_amd64_unsafe_state_autogen.go
+++ b/pkg/sentry/platform/kvm/kvm_amd64_unsafe_state_autogen.go
@@ -1,7 +1,6 @@
 // automatically generated by stateify.
 
-// +build amd64
-// +build amd64
-// +build amd64
+//go:build amd64 && amd64 && amd64
+// +build amd64,amd64,amd64
 
 package kvm
diff --git a/pkg/sentry/platform/kvm/kvm_arm64_state_autogen.go b/pkg/sentry/platform/kvm/kvm_arm64_state_autogen.go
index 90183b764..fc675a238 100644
--- a/pkg/sentry/platform/kvm/kvm_arm64_state_autogen.go
+++ b/pkg/sentry/platform/kvm/kvm_arm64_state_autogen.go
@@ -1,7 +1,6 @@
 // automatically generated by stateify.
 
-// +build arm64
-// +build arm64
-// +build arm64
+//go:build arm64 && arm64 && arm64
+// +build arm64,arm64,arm64
 
 package kvm
diff --git a/pkg/sentry/platform/kvm/kvm_arm64_unsafe_state_autogen.go b/pkg/sentry/platform/kvm/kvm_arm64_unsafe_state_autogen.go
index 90183b764..fc675a238 100644
--- a/pkg/sentry/platform/kvm/kvm_arm64_unsafe_state_autogen.go
+++ b/pkg/sentry/platform/kvm/kvm_arm64_unsafe_state_autogen.go
@@ -1,7 +1,6 @@
 // automatically generated by stateify.
 
-// +build arm64
-// +build arm64
-// +build arm64
+//go:build arm64 && arm64 && arm64
+// +build arm64,arm64,arm64
 
 package kvm
diff --git a/pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go b/pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go
index f1270c722..fbf940222 100644
--- a/pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go
+++ b/pkg/sentry/platform/kvm/kvm_unsafe_state_autogen.go
@@ -1,6 +1,6 @@
 // automatically generated by stateify.
 
-// +build go1.12,!go1.18
-// +build go1.12,!go1.18
+//go:build go1.12 && !go1.18 && go1.12 && !go1.18
+// +build go1.12,!go1.18,go1.12,!go1.18
 
 package kvm
diff --git a/pkg/sentry/platform/ptrace/ptrace_amd64_state_autogen.go b/pkg/sentry/platform/ptrace/ptrace_amd64_state_autogen.go
index f730ab393..9a5228154 100644
--- a/pkg/sentry/platform/ptrace/ptrace_amd64_state_autogen.go
+++ b/pkg/sentry/platform/ptrace/ptrace_amd64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build amd64
 // +build amd64
 
 package ptrace
diff --git a/pkg/sentry/platform/ptrace/ptrace_arm64_state_autogen.go b/pkg/sentry/platform/ptrace/ptrace_arm64_state_autogen.go
index 6239d1305..477523841 100644
--- a/pkg/sentry/platform/ptrace/ptrace_arm64_state_autogen.go
+++ b/pkg/sentry/platform/ptrace/ptrace_arm64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build arm64
 // +build arm64
 
 package ptrace
diff --git a/pkg/sentry/platform/ptrace/ptrace_arm64_unsafe_state_autogen.go b/pkg/sentry/platform/ptrace/ptrace_arm64_unsafe_state_autogen.go
index 6239d1305..477523841 100644
--- a/pkg/sentry/platform/ptrace/ptrace_arm64_unsafe_state_autogen.go
+++ b/pkg/sentry/platform/ptrace/ptrace_arm64_unsafe_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build arm64
 // +build arm64
 
 package ptrace
diff --git a/pkg/sentry/platform/ptrace/ptrace_linux_state_autogen.go b/pkg/sentry/platform/ptrace/ptrace_linux_state_autogen.go
index 9f90aef93..fcfee0226 100644
--- a/pkg/sentry/platform/ptrace/ptrace_linux_state_autogen.go
+++ b/pkg/sentry/platform/ptrace/ptrace_linux_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build linux
 // +build linux
 
 package ptrace
diff --git a/pkg/sentry/platform/ptrace/ptrace_linux_unsafe_state_autogen.go b/pkg/sentry/platform/ptrace/ptrace_linux_unsafe_state_autogen.go
index 45d94c547..bf3fccfcb 100644
--- a/pkg/sentry/platform/ptrace/ptrace_linux_unsafe_state_autogen.go
+++ b/pkg/sentry/platform/ptrace/ptrace_linux_unsafe_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build linux && (amd64 || arm64)
 // +build linux
 // +build amd64 arm64
 
diff --git a/pkg/sentry/platform/ptrace/ptrace_unsafe_state_autogen.go b/pkg/sentry/platform/ptrace/ptrace_unsafe_state_autogen.go
index ab4ad223e..66758e4ba 100644
--- a/pkg/sentry/platform/ptrace/ptrace_unsafe_state_autogen.go
+++ b/pkg/sentry/platform/ptrace/ptrace_unsafe_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build go1.12 && !go1.18
 // +build go1.12,!go1.18
 
 package ptrace
diff --git a/pkg/sentry/socket/hostinet/hostinet_impl_state_autogen.go b/pkg/sentry/socket/hostinet/hostinet_impl_state_autogen.go
index 7dd0e5006..e52b4a6d6 100644
--- a/pkg/sentry/socket/hostinet/hostinet_impl_state_autogen.go
+++ b/pkg/sentry/socket/hostinet/hostinet_impl_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build go1.1
 // +build go1.1
 
 package hostinet
diff --git a/pkg/sentry/socket/netfilter/netfilter_abi_autogen_unsafe.go b/pkg/sentry/socket/netfilter/netfilter_abi_autogen_unsafe.go
index ea4abc34f..786b62935 100644
--- a/pkg/sentry/socket/netfilter/netfilter_abi_autogen_unsafe.go
+++ b/pkg/sentry/socket/netfilter/netfilter_abi_autogen_unsafe.go
@@ -1,11 +1,5 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
-// come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
-
 package netfilter
 
 import (
diff --git a/pkg/sentry/state/state_state_autogen.go b/pkg/sentry/state/state_state_autogen.go
index e3e199293..305f03f52 100644
--- a/pkg/sentry/state/state_state_autogen.go
+++ b/pkg/sentry/state/state_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build go1.1
 // +build go1.1
 
 package state
diff --git a/pkg/sentry/strace/strace_amd64_state_autogen.go b/pkg/sentry/strace/strace_amd64_state_autogen.go
index c7d4b3eb4..2a3d1077f 100644
--- a/pkg/sentry/strace/strace_amd64_state_autogen.go
+++ b/pkg/sentry/strace/strace_amd64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build amd64
 // +build amd64
 
 package strace
diff --git a/pkg/sentry/strace/strace_arm64_state_autogen.go b/pkg/sentry/strace/strace_arm64_state_autogen.go
index 9b8f66dc9..c64c9df57 100644
--- a/pkg/sentry/strace/strace_arm64_state_autogen.go
+++ b/pkg/sentry/strace/strace_arm64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build arm64
 // +build arm64
 
 package strace
diff --git a/pkg/sentry/syscalls/linux/linux_abi_autogen_unsafe.go b/pkg/sentry/syscalls/linux/linux_abi_autogen_unsafe.go
index 8539f13c3..409927919 100644
--- a/pkg/sentry/syscalls/linux/linux_abi_autogen_unsafe.go
+++ b/pkg/sentry/syscalls/linux/linux_abi_autogen_unsafe.go
@@ -1,11 +1,5 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
-// come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
-
 package linux
 
 import (
diff --git a/pkg/sentry/syscalls/linux/linux_amd64_abi_autogen_unsafe.go b/pkg/sentry/syscalls/linux/linux_amd64_abi_autogen_unsafe.go
index 8238cf9c8..84d67731a 100644
--- a/pkg/sentry/syscalls/linux/linux_amd64_abi_autogen_unsafe.go
+++ b/pkg/sentry/syscalls/linux/linux_amd64_abi_autogen_unsafe.go
@@ -1,14 +1,13 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
+// If there are issues with build constraint aggregation, see
+// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here
 // come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
+// is filtered based on pre-defined file suffixes related to build constraints,
+// see tools/defs.bzl:calculate_sets().
 
-// +build amd64
-// +build amd64
-// +build amd64
+//go:build amd64 && amd64 && amd64
+// +build amd64,amd64,amd64
 
 package linux
 
diff --git a/pkg/sentry/syscalls/linux/linux_amd64_state_autogen.go b/pkg/sentry/syscalls/linux/linux_amd64_state_autogen.go
index b3e3be0b6..19f7a855e 100644
--- a/pkg/sentry/syscalls/linux/linux_amd64_state_autogen.go
+++ b/pkg/sentry/syscalls/linux/linux_amd64_state_autogen.go
@@ -1,7 +1,6 @@
 // automatically generated by stateify.
 
-// +build amd64
-// +build amd64
-// +build amd64
+//go:build amd64 && amd64 && amd64
+// +build amd64,amd64,amd64
 
 package linux
diff --git a/pkg/sentry/syscalls/linux/linux_arm64_abi_autogen_unsafe.go b/pkg/sentry/syscalls/linux/linux_arm64_abi_autogen_unsafe.go
index 6f0f546ea..6bbdf8d79 100644
--- a/pkg/sentry/syscalls/linux/linux_arm64_abi_autogen_unsafe.go
+++ b/pkg/sentry/syscalls/linux/linux_arm64_abi_autogen_unsafe.go
@@ -1,14 +1,13 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
+// If there are issues with build constraint aggregation, see
+// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here
 // come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
+// is filtered based on pre-defined file suffixes related to build constraints,
+// see tools/defs.bzl:calculate_sets().
 
-// +build arm64
-// +build arm64
-// +build arm64
+//go:build arm64 && arm64 && arm64
+// +build arm64,arm64,arm64
 
 package linux
 
diff --git a/pkg/sentry/syscalls/linux/linux_arm64_state_autogen.go b/pkg/sentry/syscalls/linux/linux_arm64_state_autogen.go
index f03e36ddc..ecc524560 100644
--- a/pkg/sentry/syscalls/linux/linux_arm64_state_autogen.go
+++ b/pkg/sentry/syscalls/linux/linux_arm64_state_autogen.go
@@ -1,7 +1,6 @@
 // automatically generated by stateify.
 
-// +build arm64
-// +build arm64
-// +build arm64
+//go:build arm64 && arm64 && arm64
+// +build arm64,arm64,arm64
 
 package linux
diff --git a/pkg/sentry/syscalls/linux/vfs2/vfs2_abi_autogen_unsafe.go b/pkg/sentry/syscalls/linux/vfs2/vfs2_abi_autogen_unsafe.go
index 0525fce4c..01b0d465f 100644
--- a/pkg/sentry/syscalls/linux/vfs2/vfs2_abi_autogen_unsafe.go
+++ b/pkg/sentry/syscalls/linux/vfs2/vfs2_abi_autogen_unsafe.go
@@ -1,11 +1,5 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
-// come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
-
 package vfs2
 
 import (
diff --git a/pkg/sentry/syscalls/linux/vfs2/vfs2_amd64_abi_autogen_unsafe.go b/pkg/sentry/syscalls/linux/vfs2/vfs2_amd64_abi_autogen_unsafe.go
index f07118503..d5335190c 100644
--- a/pkg/sentry/syscalls/linux/vfs2/vfs2_amd64_abi_autogen_unsafe.go
+++ b/pkg/sentry/syscalls/linux/vfs2/vfs2_amd64_abi_autogen_unsafe.go
@@ -1,11 +1,12 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
+// If there are issues with build constraint aggregation, see
+// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here
 // come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
+// is filtered based on pre-defined file suffixes related to build constraints,
+// see tools/defs.bzl:calculate_sets().
 
+//go:build amd64
 // +build amd64
 
 package vfs2
diff --git a/pkg/sentry/syscalls/linux/vfs2/vfs2_amd64_state_autogen.go b/pkg/sentry/syscalls/linux/vfs2/vfs2_amd64_state_autogen.go
index 7f5556f9c..467b4258c 100644
--- a/pkg/sentry/syscalls/linux/vfs2/vfs2_amd64_state_autogen.go
+++ b/pkg/sentry/syscalls/linux/vfs2/vfs2_amd64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build amd64
 // +build amd64
 
 package vfs2
diff --git a/pkg/sentry/syscalls/linux/vfs2/vfs2_arm64_abi_autogen_unsafe.go b/pkg/sentry/syscalls/linux/vfs2/vfs2_arm64_abi_autogen_unsafe.go
index ea1f77a0f..07ab07d17 100644
--- a/pkg/sentry/syscalls/linux/vfs2/vfs2_arm64_abi_autogen_unsafe.go
+++ b/pkg/sentry/syscalls/linux/vfs2/vfs2_arm64_abi_autogen_unsafe.go
@@ -1,11 +1,12 @@
 // Automatically generated marshal implementation. See tools/go_marshal.
 
-// If there are issues with build tag aggregation, see
-// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here
+// If there are issues with build constraint aggregation, see
+// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here
 // come from the input set of files used to generate this file. This input set
-// is filtered based on pre-defined file suffixes related to build tags, see 
-// tools/defs.bzl:calculate_sets().
+// is filtered based on pre-defined file suffixes related to build constraints,
+// see tools/defs.bzl:calculate_sets().
 
+//go:build arm64
 // +build arm64
 
 package vfs2
diff --git a/pkg/sentry/syscalls/linux/vfs2/vfs2_arm64_state_autogen.go b/pkg/sentry/syscalls/linux/vfs2/vfs2_arm64_state_autogen.go
index 3e3862045..2e1a50af5 100644
--- a/pkg/sentry/syscalls/linux/vfs2/vfs2_arm64_state_autogen.go
+++ b/pkg/sentry/syscalls/linux/vfs2/vfs2_arm64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build arm64
 // +build arm64
 
 package vfs2
diff --git a/pkg/sentry/time/time_amd64_state_autogen.go b/pkg/sentry/time/time_amd64_state_autogen.go
index a4d3199ac..3306b8b88 100644
--- a/pkg/sentry/time/time_amd64_state_autogen.go
+++ b/pkg/sentry/time/time_amd64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build amd64
 // +build amd64
 
 package time
diff --git a/pkg/sentry/time/time_arm64_state_autogen.go b/pkg/sentry/time/time_arm64_state_autogen.go
index 6929b58cd..233d240c4 100644
--- a/pkg/sentry/time/time_arm64_state_autogen.go
+++ b/pkg/sentry/time/time_arm64_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build arm64
 // +build arm64
 
 package time
diff --git a/pkg/shim/runtimeoptions/runtimeoptions_state_autogen.go b/pkg/shim/runtimeoptions/runtimeoptions_state_autogen.go
index 346542871..73e0a158d 100644
--- a/pkg/shim/runtimeoptions/runtimeoptions_state_autogen.go
+++ b/pkg/shim/runtimeoptions/runtimeoptions_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build go1.1
 // +build go1.1
 
 package runtimeoptions
diff --git a/pkg/shim/shim_linux_state_autogen.go b/pkg/shim/shim_linux_state_autogen.go
index 191a9e496..c3dd06dfe 100644
--- a/pkg/shim/shim_linux_state_autogen.go
+++ b/pkg/shim/shim_linux_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build linux
 // +build linux
 
 package shim
diff --git a/pkg/shim/shim_state_autogen.go b/pkg/shim/shim_state_autogen.go
index 191a9e496..c3dd06dfe 100644
--- a/pkg/shim/shim_state_autogen.go
+++ b/pkg/shim/shim_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build linux
 // +build linux
 
 package shim
diff --git a/pkg/syserr/syserr_linux_state_autogen.go b/pkg/syserr/syserr_linux_state_autogen.go
index 7fd5a68b8..90e796197 100644
--- a/pkg/syserr/syserr_linux_state_autogen.go
+++ b/pkg/syserr/syserr_linux_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build linux
 // +build linux
 
 package syserr
diff --git a/pkg/tcpip/link/fdbased/fdbased_state_autogen.go b/pkg/tcpip/link/fdbased/fdbased_state_autogen.go
index b84e8f21c..586f166a4 100644
--- a/pkg/tcpip/link/fdbased/fdbased_state_autogen.go
+++ b/pkg/tcpip/link/fdbased/fdbased_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build linux && ((linux && amd64) || (linux && arm64)) && (!linux || (!amd64 && !arm64)) && linux
 // +build linux
 // +build linux,amd64 linux,arm64
 // +build !linux !amd64,!arm64
diff --git a/pkg/tcpip/link/fdbased/fdbased_unsafe_state_autogen.go b/pkg/tcpip/link/fdbased/fdbased_unsafe_state_autogen.go
index e2ed505b2..6a5ed4a3c 100644
--- a/pkg/tcpip/link/fdbased/fdbased_unsafe_state_autogen.go
+++ b/pkg/tcpip/link/fdbased/fdbased_unsafe_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build linux && ((linux && amd64) || (linux && arm64))
 // +build linux
 // +build linux,amd64 linux,arm64
 
diff --git a/pkg/tcpip/link/rawfile/rawfile_state_autogen.go b/pkg/tcpip/link/rawfile/rawfile_state_autogen.go
index 338e9679b..00708246f 100644
--- a/pkg/tcpip/link/rawfile/rawfile_state_autogen.go
+++ b/pkg/tcpip/link/rawfile/rawfile_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build linux
 // +build linux
 
 package rawfile
diff --git a/pkg/tcpip/link/rawfile/rawfile_unsafe_state_autogen.go b/pkg/tcpip/link/rawfile/rawfile_unsafe_state_autogen.go
index f5eace013..cc9eea2a0 100644
--- a/pkg/tcpip/link/rawfile/rawfile_unsafe_state_autogen.go
+++ b/pkg/tcpip/link/rawfile/rawfile_unsafe_state_autogen.go
@@ -1,6 +1,9 @@
 // automatically generated by stateify.
 
-// +build linux,!amd64,!arm64
+//go:build linux && !amd64 && !arm64 && ((linux && amd64) || (linux && arm64)) && go1.12 && !go1.18 && linux
+// +build linux
+// +build !amd64
+// +build !arm64
 // +build linux,amd64 linux,arm64
 // +build go1.12
 // +build !go1.18
diff --git a/pkg/tcpip/link/sharedmem/sharedmem_state_autogen.go b/pkg/tcpip/link/sharedmem/sharedmem_state_autogen.go
index bc12017b2..86551c9f5 100644
--- a/pkg/tcpip/link/sharedmem/sharedmem_state_autogen.go
+++ b/pkg/tcpip/link/sharedmem/sharedmem_state_autogen.go
@@ -1,6 +1,6 @@
 // automatically generated by stateify.
 
-// +build linux
-// +build linux
+//go:build linux && linux
+// +build linux,linux
 
 package sharedmem
diff --git a/pkg/tcpip/link/tun/tun_unsafe_state_autogen.go b/pkg/tcpip/link/tun/tun_unsafe_state_autogen.go
index 149299ea3..8d82ad324 100644
--- a/pkg/tcpip/link/tun/tun_unsafe_state_autogen.go
+++ b/pkg/tcpip/link/tun/tun_unsafe_state_autogen.go
@@ -1,5 +1,6 @@
 // automatically generated by stateify.
 
+//go:build linux
 // +build linux
 
 package tun