diff --git a/cpu/asm_aix_ppc64.s b/cpu/asm_aix_ppc64.s
index 06f84b85..6b4027b3 100644
--- a/cpu/asm_aix_ppc64.s
+++ b/cpu/asm_aix_ppc64.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/cpu/cpu_arm64.s b/cpu/cpu_arm64.s
index a54436e3..cfc08c97 100644
--- a/cpu/cpu_arm64.s
+++ b/cpu/cpu_arm64.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/cpu/cpu_gc_arm64.go b/cpu/cpu_gc_arm64.go
index 7b88e865..7f7f272a 100644
--- a/cpu/cpu_gc_arm64.go
+++ b/cpu/cpu_gc_arm64.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 package cpu
 
diff --git a/cpu/cpu_gc_s390x.go b/cpu/cpu_gc_s390x.go
index 568bcd03..75a95566 100644
--- a/cpu/cpu_gc_s390x.go
+++ b/cpu/cpu_gc_s390x.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 package cpu
 
diff --git a/cpu/cpu_gc_x86.go b/cpu/cpu_gc_x86.go
index f7cb4697..4adb89cf 100644
--- a/cpu/cpu_gc_x86.go
+++ b/cpu/cpu_gc_x86.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build 386 amd64 amd64p32
-// +build !gccgo
+// +build gc
 
 package cpu
 
diff --git a/cpu/cpu_s390x.s b/cpu/cpu_s390x.s
index e5037d92..964946df 100644
--- a/cpu/cpu_s390x.s
+++ b/cpu/cpu_s390x.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/cpu/cpu_x86.s b/cpu/cpu_x86.s
index 47f08412..2f557a58 100644
--- a/cpu/cpu_x86.s
+++ b/cpu/cpu_x86.s
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build 386 amd64 amd64p32
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/cpu/syscall_aix_ppc64_gc.go b/cpu/syscall_aix_ppc64_gc.go
index 78fe25e8..5b427d67 100644
--- a/cpu/syscall_aix_ppc64_gc.go
+++ b/cpu/syscall_aix_ppc64_gc.go
@@ -7,7 +7,7 @@
 // (See golang.org/issue/32102)
 
 // +build aix,ppc64
-// +build !gccgo
+// +build gc
 
 package cpu
 
diff --git a/unix/asm_aix_ppc64.s b/unix/asm_aix_ppc64.s
index 06f84b85..6b4027b3 100644
--- a/unix/asm_aix_ppc64.s
+++ b/unix/asm_aix_ppc64.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_darwin_386.s b/unix/asm_darwin_386.s
index 8a727831..8a06b87d 100644
--- a/unix/asm_darwin_386.s
+++ b/unix/asm_darwin_386.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_darwin_amd64.s b/unix/asm_darwin_amd64.s
index 6321421f..f2397fde 100644
--- a/unix/asm_darwin_amd64.s
+++ b/unix/asm_darwin_amd64.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_darwin_arm.s b/unix/asm_darwin_arm.s
index 333242d5..c9e6b6fc 100644
--- a/unix/asm_darwin_arm.s
+++ b/unix/asm_darwin_arm.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 // +build arm,darwin
 
 #include "textflag.h"
diff --git a/unix/asm_darwin_arm64.s b/unix/asm_darwin_arm64.s
index 97e01743..89843f8f 100644
--- a/unix/asm_darwin_arm64.s
+++ b/unix/asm_darwin_arm64.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 // +build arm64,darwin
 
 #include "textflag.h"
diff --git a/unix/asm_dragonfly_amd64.s b/unix/asm_dragonfly_amd64.s
index 603dd572..27674e1c 100644
--- a/unix/asm_dragonfly_amd64.s
+++ b/unix/asm_dragonfly_amd64.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_freebsd_386.s b/unix/asm_freebsd_386.s
index c9a0a260..49f0ac23 100644
--- a/unix/asm_freebsd_386.s
+++ b/unix/asm_freebsd_386.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_freebsd_amd64.s b/unix/asm_freebsd_amd64.s
index 35172477..f2dfc57b 100644
--- a/unix/asm_freebsd_amd64.s
+++ b/unix/asm_freebsd_amd64.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_freebsd_arm.s b/unix/asm_freebsd_arm.s
index 9227c875..6d740db2 100644
--- a/unix/asm_freebsd_arm.s
+++ b/unix/asm_freebsd_arm.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_freebsd_arm64.s b/unix/asm_freebsd_arm64.s
index d9318cbf..a8f5a29b 100644
--- a/unix/asm_freebsd_arm64.s
+++ b/unix/asm_freebsd_arm64.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_linux_386.s b/unix/asm_linux_386.s
index 448bebbb..0655ecbf 100644
--- a/unix/asm_linux_386.s
+++ b/unix/asm_linux_386.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_linux_amd64.s b/unix/asm_linux_amd64.s
index c6468a95..bc3fb6ac 100644
--- a/unix/asm_linux_amd64.s
+++ b/unix/asm_linux_amd64.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_linux_arm.s b/unix/asm_linux_arm.s
index cf0f3575..55b13c7b 100644
--- a/unix/asm_linux_arm.s
+++ b/unix/asm_linux_arm.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_linux_arm64.s b/unix/asm_linux_arm64.s
index afe6fdf6..22a83d8e 100644
--- a/unix/asm_linux_arm64.s
+++ b/unix/asm_linux_arm64.s
@@ -4,7 +4,7 @@
 
 // +build linux
 // +build arm64
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_linux_mips64x.s b/unix/asm_linux_mips64x.s
index ab9d6383..dc222b90 100644
--- a/unix/asm_linux_mips64x.s
+++ b/unix/asm_linux_mips64x.s
@@ -4,7 +4,7 @@
 
 // +build linux
 // +build mips64 mips64le
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_linux_mipsx.s b/unix/asm_linux_mipsx.s
index 99e53990..d333f13c 100644
--- a/unix/asm_linux_mipsx.s
+++ b/unix/asm_linux_mipsx.s
@@ -4,7 +4,7 @@
 
 // +build linux
 // +build mips mipsle
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_linux_ppc64x.s b/unix/asm_linux_ppc64x.s
index 88f71255..459a629c 100644
--- a/unix/asm_linux_ppc64x.s
+++ b/unix/asm_linux_ppc64x.s
@@ -4,7 +4,7 @@
 
 // +build linux
 // +build ppc64 ppc64le
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_linux_riscv64.s b/unix/asm_linux_riscv64.s
index 3cfefed2..04d38497 100644
--- a/unix/asm_linux_riscv64.s
+++ b/unix/asm_linux_riscv64.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build riscv64,!gccgo
+// +build riscv64,gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_linux_s390x.s b/unix/asm_linux_s390x.s
index a5a863c6..cc303989 100644
--- a/unix/asm_linux_s390x.s
+++ b/unix/asm_linux_s390x.s
@@ -4,7 +4,7 @@
 
 // +build s390x
 // +build linux
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_netbsd_386.s b/unix/asm_netbsd_386.s
index 48bdcd76..ae7b498d 100644
--- a/unix/asm_netbsd_386.s
+++ b/unix/asm_netbsd_386.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_netbsd_amd64.s b/unix/asm_netbsd_amd64.s
index 2ede05c7..e57367c1 100644
--- a/unix/asm_netbsd_amd64.s
+++ b/unix/asm_netbsd_amd64.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_netbsd_arm.s b/unix/asm_netbsd_arm.s
index e8928571..d7da175e 100644
--- a/unix/asm_netbsd_arm.s
+++ b/unix/asm_netbsd_arm.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_netbsd_arm64.s b/unix/asm_netbsd_arm64.s
index 6f98ba5a..e7cbe190 100644
--- a/unix/asm_netbsd_arm64.s
+++ b/unix/asm_netbsd_arm64.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_openbsd_386.s b/unix/asm_openbsd_386.s
index 00576f3c..2f00b031 100644
--- a/unix/asm_openbsd_386.s
+++ b/unix/asm_openbsd_386.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_openbsd_amd64.s b/unix/asm_openbsd_amd64.s
index 790ef77f..07632c99 100644
--- a/unix/asm_openbsd_amd64.s
+++ b/unix/asm_openbsd_amd64.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_openbsd_arm.s b/unix/asm_openbsd_arm.s
index 469bfa10..73e99732 100644
--- a/unix/asm_openbsd_arm.s
+++ b/unix/asm_openbsd_arm.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_openbsd_arm64.s b/unix/asm_openbsd_arm64.s
index 0cedea3d..c47302aa 100644
--- a/unix/asm_openbsd_arm64.s
+++ b/unix/asm_openbsd_arm64.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_openbsd_mips64.s b/unix/asm_openbsd_mips64.s
index 567a4763..47c93fcb 100644
--- a/unix/asm_openbsd_mips64.s
+++ b/unix/asm_openbsd_mips64.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/asm_solaris_amd64.s b/unix/asm_solaris_amd64.s
index ded8260f..1f2c755a 100644
--- a/unix/asm_solaris_amd64.s
+++ b/unix/asm_solaris_amd64.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !gccgo
+// +build gc
 
 #include "textflag.h"
 
diff --git a/unix/mksyscall_aix_ppc64.go b/unix/mksyscall_aix_ppc64.go
index c9600995..afc36a07 100644
--- a/unix/mksyscall_aix_ppc64.go
+++ b/unix/mksyscall_aix_ppc64.go
@@ -570,7 +570,7 @@ const srcTemplate2 = `// %s
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build %s
-// +build !gccgo
+// +build gc
 
 package %s
 
diff --git a/unix/syscall_linux_amd64_gc.go b/unix/syscall_linux_amd64_gc.go
index 21a4946b..baa771f8 100644
--- a/unix/syscall_linux_amd64_gc.go
+++ b/unix/syscall_linux_amd64_gc.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build amd64,linux
-// +build !gccgo
+// +build gc
 
 package unix
 
diff --git a/unix/syscall_linux_gc.go b/unix/syscall_linux_gc.go
index c26e6ec2..9edf3961 100644
--- a/unix/syscall_linux_gc.go
+++ b/unix/syscall_linux_gc.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build linux,!gccgo
+// +build linux,gc
 
 package unix
 
diff --git a/unix/syscall_linux_gc_386.go b/unix/syscall_linux_gc_386.go
index 070bd389..90e33d8c 100644
--- a/unix/syscall_linux_gc_386.go
+++ b/unix/syscall_linux_gc_386.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build linux,!gccgo,386
+// +build linux,gc,386
 
 package unix
 
diff --git a/unix/syscall_linux_gc_arm.go b/unix/syscall_linux_gc_arm.go
index 8c514c95..1a97baae 100644
--- a/unix/syscall_linux_gc_arm.go
+++ b/unix/syscall_linux_gc_arm.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build arm,!gccgo,linux
+// +build arm,gc,linux
 
 package unix
 
diff --git a/unix/syscall_unix_gc.go b/unix/syscall_unix_gc.go
index 1c70d1b6..87bd161c 100644
--- a/unix/syscall_unix_gc.go
+++ b/unix/syscall_unix_gc.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build darwin dragonfly freebsd linux netbsd openbsd solaris
-// +build !gccgo,!ppc64le,!ppc64
+// +build gc,!ppc64le,!ppc64
 
 package unix
 
diff --git a/unix/syscall_unix_gc_ppc64x.go b/unix/syscall_unix_gc_ppc64x.go
index 86dc765a..d36216c3 100644
--- a/unix/syscall_unix_gc_ppc64x.go
+++ b/unix/syscall_unix_gc_ppc64x.go
@@ -4,7 +4,7 @@
 
 // +build linux
 // +build ppc64le ppc64
-// +build !gccgo
+// +build gc
 
 package unix
 
diff --git a/unix/zsyscall_aix_ppc64_gc.go b/unix/zsyscall_aix_ppc64_gc.go
index 4b3a8ad7..0550da06 100644
--- a/unix/zsyscall_aix_ppc64_gc.go
+++ b/unix/zsyscall_aix_ppc64_gc.go
@@ -2,7 +2,7 @@
 // Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build aix,ppc64
-// +build !gccgo
+// +build gc
 
 package unix