diff --git a/cpu/asm_aix_ppc64.s b/cpu/asm_aix_ppc64.s
index 6b4027b3..db9171c2 100644
--- a/cpu/asm_aix_ppc64.s
+++ b/cpu/asm_aix_ppc64.s
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build gc
 // +build gc
 
 #include "textflag.h"
diff --git a/cpu/cpu_arm64.s b/cpu/cpu_arm64.s
index cfc08c97..c61f95a0 100644
--- a/cpu/cpu_arm64.s
+++ b/cpu/cpu_arm64.s
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build gc
 // +build gc
 
 #include "textflag.h"
diff --git a/cpu/cpu_s390x.s b/cpu/cpu_s390x.s
index 964946df..96f81e20 100644
--- a/cpu/cpu_s390x.s
+++ b/cpu/cpu_s390x.s
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build gc
 // +build gc
 
 #include "textflag.h"
diff --git a/cpu/cpu_x86.s b/cpu/cpu_x86.s
index 2f557a58..39acab2f 100644
--- a/cpu/cpu_x86.s
+++ b/cpu/cpu_x86.s
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build (386 || amd64 || amd64p32) && gc
 // +build 386 amd64 amd64p32
 // +build gc