14 files changed, 36 insertions, 44 deletions
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