diff --git a/cpu/asm_aix_ppc64.s b/cpu/asm_aix_ppc64.s
index 06f84b8..6b4027b 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 a54436e..cfc08c9 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 7b88e86..7f7f272 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 568bcd0..75a9556 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 f7cb469..4adb89c 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 e5037d9..964946d 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 47f0841..2f557a5 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 78fe25e..5b427d6 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 06f84b8..6b4027b 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 8a72783..8a06b87 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 6321421..f2397fd 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 333242d..c9e6b6f 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 97e0174..89843f8 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 603dd57..27674e1 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 c9a0a26..49f0ac2 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 3517247..f2dfc57 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 9227c87..6d740db 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 d9318cb..a8f5a29 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 448bebb..0655ecb 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 c6468a9..bc3fb6a 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 cf0f357..55b13c7 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 afe6fdf..22a83d8 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 ab9d638..dc222b9 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 99e5399..d333f13 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 88f7125..459a629 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 3cfefed..04d3849 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 a5a863c..cc30398 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 48bdcd7..ae7b498 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 2ede05c..e57367c 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 e892857..d7da175 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 6f98ba5..e7cbe19 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 00576f3..2f00b03 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 790ef77..07632c9 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 469bfa1..73e9973 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 0cedea3..c47302a 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 567a476..47c93fc 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 ded8260..1f2c755 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 c960099..afc36a0 100644
--- a/unix/mksyscall_aix_ppc64.go
+++ b/unix/mksyscall_aix_ppc64.go
@@ -570,7 +570,7 @@
 // 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 21a4946..baa771f 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 c26e6ec..9edf396 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 070bd38..90e33d8 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 8c514c9..1a97baa 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 1c70d1b..87bd161 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 86dc765..d36216c 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 4b3a8ad..0550da0 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