18 files changed, 23 insertions, 14 deletions
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