misc/cgo: remove +build lines, add go:build where needed

Change-Id: Iae6ac32db5c2aacb323793a7e0dc34e09648d035
Reviewed-on: https://go-review.googlesource.com/c/go/+/482295
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: David Chase <drchase@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Auto-Submit: Ian Lance Taylor <iant@golang.org>

diff --git a/misc/cgo/gmp/fib.go b/misc/cgo/gmp/fib.go
index f453fcf1843b7c13123398a212c0d8cc64935817..48b070049fc374a958e8889e3f601c6273d03a5a 100644 (file)
--- a/misc/cgo/gmp/fib.go
+++ b/misc/cgo/gmp/fib.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 // Compute Fibonacci numbers with two goroutines
 // that pass integers back and forth.  No actual

diff --git a/misc/cgo/gmp/pi.go b/misc/cgo/gmp/pi.go
index 5ea034900a9b172a92fc6b716135f6450c4f5767..537a426b3804b39be477bcc42ab69202e7b0ffbf 100644 (file)
--- a/misc/cgo/gmp/pi.go
+++ b/misc/cgo/gmp/pi.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package main
 

diff --git a/misc/cgo/test/callback_c_gc.c b/misc/cgo/test/callback_c_gc.c
index eb720eba7c469afe32a1580ee8dd1e672767a5e7..c6666c2b4e58ecae6b1d7f96ee1f4b1b0617f21a 100644 (file)
--- a/misc/cgo/test/callback_c_gc.c
+++ b/misc/cgo/test/callback_c_gc.c
@@ -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 gc
+//go:build gc
 
 #include "_cgo_export.h"
 #include <stdint.h>

diff --git a/misc/cgo/test/callback_c_gccgo.c b/misc/cgo/test/callback_c_gccgo.c
index 4eaa8184b30482cf510a311062672f1b779cfc09..91d37f02d8f3b2ecfa370ebd992ccb7590f541d7 100644 (file)
--- a/misc/cgo/test/callback_c_gccgo.c
+++ b/misc/cgo/test/callback_c_gccgo.c
@@ -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
+//go:build gccgo
 
 #include "_cgo_export.h"
 #include <stdint.h>

diff --git a/misc/cgo/test/cgo_thread_lock.go b/misc/cgo/test/cgo_thread_lock.go
index 3b9ac845493cd5cfd4d9a665e56e94cab2139956..1c983375d92d738db9322125da585411a11ff47e 100644 (file)
--- a/misc/cgo/test/cgo_thread_lock.go
+++ b/misc/cgo/test/cgo_thread_lock.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && freebsd && openbsd
-// +build linux,freebsd,openbsd
 
 package cgotest
 

diff --git a/misc/cgo/test/cgo_unix_test.go b/misc/cgo/test/cgo_unix_test.go
index a324503a22faf06ac261c079cdb70e30c851c446..e6d6ee54b4aba3db448ccc4b523ac8094a36b60e 100644 (file)
--- a/misc/cgo/test/cgo_unix_test.go
+++ b/misc/cgo/test/cgo_unix_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !windows
-// +build !windows
 
 package cgotest
 

diff --git a/misc/cgo/test/cthread_unix.c b/misc/cgo/test/cthread_unix.c
index 13623254a97260999eea927d2f18acf7578576c6..d0da643158e5f45776ec1296b8f76325942401e4 100644 (file)
--- a/misc/cgo/test/cthread_unix.c
+++ b/misc/cgo/test/cthread_unix.c
@@ -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 aix darwin dragonfly freebsd linux netbsd openbsd solaris
+//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
 
 #include <pthread.h>
 #include "_cgo_export.h"

diff --git a/misc/cgo/test/issue1435.go b/misc/cgo/test/issue1435.go
index 3fb721ac395c2df6e2234e7b7f3d08c1e3021b31..a672e26aa09c34b2d80fcd4ade314f99fc2c586b 100644 (file)
--- a/misc/cgo/test/issue1435.go
+++ b/misc/cgo/test/issue1435.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && cgo
-// +build linux,cgo
 
 package cgotest
 

diff --git a/misc/cgo/test/issue18146.go b/misc/cgo/test/issue18146.go
index e50f9ae53016fce2f88e1b0118145635f41c19d5..f02fc4476d88418c16ad0bbcad3ce109c4a42e53 100644 (file)
--- a/misc/cgo/test/issue18146.go
+++ b/misc/cgo/test/issue18146.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !windows
-// +build !windows
 
 // Issue 18146: pthread_create failure during syscall.Exec.
 

diff --git a/misc/cgo/test/issue21897.go b/misc/cgo/test/issue21897.go
index 8f39252e688580af7bcd5525426cdd43dc7725a3..cd3600a0cf0f304089eb687354a4815eb4188aae 100644 (file)
--- a/misc/cgo/test/issue21897.go
+++ b/misc/cgo/test/issue21897.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin && cgo && !internal
-// +build darwin,cgo,!internal
 
 package cgotest
 

diff --git a/misc/cgo/test/issue21897b.go b/misc/cgo/test/issue21897b.go
index 50aece3528947ba2f8bd8ba2858628ffda1bf3fa..e12564c2164804f85317a96afa63403ef3213def 100644 (file)
--- a/misc/cgo/test/issue21897b.go
+++ b/misc/cgo/test/issue21897b.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !darwin || !cgo || internal
-// +build !darwin !cgo internal
 
 package cgotest
 

diff --git a/misc/cgo/test/issue24161arg/def.go b/misc/cgo/test/issue24161arg/def.go
index 06126143e52ef51c82774b8733c865d3e8375e00..acea3aeb34e1d500d8255d1f2296992dd8e71bcd 100644 (file)
--- a/misc/cgo/test/issue24161arg/def.go
+++ b/misc/cgo/test/issue24161arg/def.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin
-// +build darwin
 
 package issue24161arg
 

diff --git a/misc/cgo/test/issue24161arg/use.go b/misc/cgo/test/issue24161arg/use.go
index a776ce0584eae5ed5f73f5957770cabf66b4a5fd..7987105efa6b529044d18da3b007693c050d31c2 100644 (file)
--- a/misc/cgo/test/issue24161arg/use.go
+++ b/misc/cgo/test/issue24161arg/use.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin
-// +build darwin
 
 package issue24161arg
 

diff --git a/misc/cgo/test/issue24161e0/main.go b/misc/cgo/test/issue24161e0/main.go
index 4b139552e2c107be31872c39331ac6345ecd015b..5912fe27cc23b64212cd7a7d93735fd737d93172 100644 (file)
--- a/misc/cgo/test/issue24161e0/main.go
+++ b/misc/cgo/test/issue24161e0/main.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin
-// +build darwin
 
 package issue24161e0
 

diff --git a/misc/cgo/test/issue24161e1/main.go b/misc/cgo/test/issue24161e1/main.go
index 1b30b9a9fc3201dad45ff3cf0375823bfb945141..8c2bc6ec07adb0fc54ee1c206c61027e5f1f9a53 100644 (file)
--- a/misc/cgo/test/issue24161e1/main.go
+++ b/misc/cgo/test/issue24161e1/main.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin
-// +build darwin
 
 package issue24161e1
 

diff --git a/misc/cgo/test/issue24161e2/main.go b/misc/cgo/test/issue24161e2/main.go
index 4a7e1033e3759f7d9dc276eace5064977a240db4..159f4796fe6367e52f8a6a2d07c52008c36ff972 100644 (file)
--- a/misc/cgo/test/issue24161e2/main.go
+++ b/misc/cgo/test/issue24161e2/main.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin
-// +build darwin
 
 package issue24161e2
 

diff --git a/misc/cgo/test/issue24161res/restype.go b/misc/cgo/test/issue24161res/restype.go
index cb33f3c8aa36e16a5a5c7ed11ca2b4895bf7877d..07cb98dbcfefccbaa325a47b8fa9de6bd6bd4528 100644 (file)
--- a/misc/cgo/test/issue24161res/restype.go
+++ b/misc/cgo/test/issue24161res/restype.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin
-// +build darwin
 
 package issue24161res
 

diff --git a/misc/cgo/test/issue29563.go b/misc/cgo/test/issue29563.go
index 9f29da4c751ecbcfc3f8fc695ac1b195338a10a5..bbe98bbd48c2650a6416fc7a2ef04c4e8f6f5f34 100644 (file)
--- a/misc/cgo/test/issue29563.go
+++ b/misc/cgo/test/issue29563.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !windows
-// +build !windows
 
 // Issue 29563: internal linker fails on duplicate weak symbols.
 // No runtime test; just make sure it compiles.

diff --git a/misc/cgo/test/issue4029.c b/misc/cgo/test/issue4029.c
index e79c5a709c87eb3e6ece6e16682cad1e52e14678..212d6922f8d562c00de87b57f947259895416824 100644 (file)
--- a/misc/cgo/test/issue4029.c
+++ b/misc/cgo/test/issue4029.c
@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !windows,!static
-// +build !darwin !internal_pie,!arm64
+//go:build !windows && !static && (!darwin || (!internal_pie && !arm64))
 
 #include <stdint.h>
 #include <dlfcn.h>

diff --git a/misc/cgo/test/issue4029.go b/misc/cgo/test/issue4029.go
index 90ca08cbfb7da8b17d4b128aaf471a8dd546772f..686b7679f33a1bc14803a365406a1ffa8f370ee6 100644 (file)
--- a/misc/cgo/test/issue4029.go
+++ b/misc/cgo/test/issue4029.go
@@ -3,9 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !windows && !static && (!darwin || (!internal_pie && !arm64))
-// +build !windows
-// +build !static
-// +build !darwin !internal_pie,!arm64
 
 // Excluded in darwin internal linking PIE mode, as dynamic export is not
 // supported.

diff --git a/misc/cgo/test/issue4029w.go b/misc/cgo/test/issue4029w.go
index c2f59485e490d6aec158fddda918bfddf618253e..91dad6abcb762734c6c5f18964a55d5bf505015a 100644 (file)
--- a/misc/cgo/test/issue4029w.go
+++ b/misc/cgo/test/issue4029w.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build windows || static || (darwin && internal_pie) || (darwin && arm64)
-// +build windows static darwin,internal_pie darwin,arm64
 
 package cgotest
 

diff --git a/misc/cgo/test/issue42018.go b/misc/cgo/test/issue42018.go
index fab686a678320cb82cf6a40b8cde2e1b2eb5866b..6b369bfab46b1bb5ffbbf12661fa9a63c5468da3 100644 (file)
--- a/misc/cgo/test/issue42018.go
+++ b/misc/cgo/test/issue42018.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !windows
-// +build !windows
 
 package cgotest
 

diff --git a/misc/cgo/test/issue6997_linux.c b/misc/cgo/test/issue6997_linux.c
index de803d296e9ee61ef5d981d5cec1c86ec8c91390..c6d251bbe503fcbb3a88d2652fd05a079e006082 100644 (file)
--- a/misc/cgo/test/issue6997_linux.c
+++ b/misc/cgo/test/issue6997_linux.c
@@ -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 !android
+//go:build !android
 
 #include <pthread.h>
 #include <stdio.h>

diff --git a/misc/cgo/test/issue6997_linux.go b/misc/cgo/test/issue6997_linux.go
index 4acc8c1a07062710cb33075dc5730d5d67e695bf..1de5edda045d6b131ff14d37ffa7783c0fa65de1 100644 (file)
--- a/misc/cgo/test/issue6997_linux.go
+++ b/misc/cgo/test/issue6997_linux.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !android
-// +build !android
 
 // Test that pthread_cancel works as expected
 // (NPTL uses SIGRTMIN to implement thread cancellation)

diff --git a/misc/cgo/test/issue8517.go b/misc/cgo/test/issue8517.go
index 7316ab0335d5cb587a50c90fa83ede25db8d649b..226151302263a0f4d28152717bd1110400a89bff 100644 (file)
--- a/misc/cgo/test/issue8517.go
+++ b/misc/cgo/test/issue8517.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !windows
-// +build !windows
 
 package cgotest
 

diff --git a/misc/cgo/test/issue8694.go b/misc/cgo/test/issue8694.go
index 19071ce1595ec74a4f588ac9e274960dc0693337..3b8f065d278d8edf067af2dfdc7fe0a8d0d2c064 100644 (file)
--- a/misc/cgo/test/issue8694.go
+++ b/misc/cgo/test/issue8694.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !android
-// +build !android
 
 package cgotest
 

diff --git a/misc/cgo/test/issue9400/asm_386.s b/misc/cgo/test/issue9400/asm_386.s
index 96b8b60c10f589dbb7f17de0eb1805cfa959082c..8a3830135fb0e6e5a2699625a9da57d43f7922b6 100644 (file)
--- a/misc/cgo/test/issue9400/asm_386.s
+++ b/misc/cgo/test/issue9400/asm_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 gc
+//go:build gc
 
 #include "textflag.h"
 

diff --git a/misc/cgo/test/issue9400/asm_amd64x.s b/misc/cgo/test/issue9400/asm_amd64x.s
index 99509bce5e1518cfdc20d329fa5c936eb1721a4b..07adaf745f4e56aa04cebeeb2df7db3f4be28529 100644 (file)
--- a/misc/cgo/test/issue9400/asm_amd64x.s
+++ b/misc/cgo/test/issue9400/asm_amd64x.s
@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build amd64 amd64p32
-// +build gc
+//go:build (amd64 || amd64p32) && gc
 
 #include "textflag.h"
 

diff --git a/misc/cgo/test/issue9400/asm_arm.s b/misc/cgo/test/issue9400/asm_arm.s
index cc92856c2ff482f6015f0f4e0f62fd9047daf16c..41261725ca48012048690e3a9c0073db90ec47bf 100644 (file)
--- a/misc/cgo/test/issue9400/asm_arm.s
+++ b/misc/cgo/test/issue9400/asm_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 gc
+//go:build gc
 
 #include "textflag.h"
 

diff --git a/misc/cgo/test/issue9400/asm_arm64.s b/misc/cgo/test/issue9400/asm_arm64.s
index 2565793f9ab00d3e068dc8e6e76b6b014c43c1fc..affbd71e65d2db92e41e802d9df497ff28607c1a 100644 (file)
--- a/misc/cgo/test/issue9400/asm_arm64.s
+++ b/misc/cgo/test/issue9400/asm_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 gc
+//go:build gc
 
 #include "textflag.h"
 

diff --git a/misc/cgo/test/issue9400/asm_mips64x.s b/misc/cgo/test/issue9400/asm_mips64x.s
index 693231ddfe1b94a8cd896cd3a29aaff2b3d52a94..1f492eafe9f1d0dbc4cbfe40b3293436d24a5ae9 100644 (file)
--- a/misc/cgo/test/issue9400/asm_mips64x.s
+++ b/misc/cgo/test/issue9400/asm_mips64x.s
@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build mips64 mips64le
-// +build gc
+//go:build (mips64 || mips64le) && gc
 
 #include "textflag.h"
 

diff --git a/misc/cgo/test/issue9400/asm_mipsx.s b/misc/cgo/test/issue9400/asm_mipsx.s
index 63261bbf9d08d82e3c85d52a99e2adfb96afecee..695273d90f6e5797b5b908af68c035c85f35d6f1 100644 (file)
--- a/misc/cgo/test/issue9400/asm_mipsx.s
+++ b/misc/cgo/test/issue9400/asm_mipsx.s
@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build mips mipsle
-// +build gc
+//go:build (mips || mipsle) && gc
 
 #include "textflag.h"
 

diff --git a/misc/cgo/test/issue9400/asm_ppc64x.s b/misc/cgo/test/issue9400/asm_ppc64x.s
index b5613fb6ec73f6f2b5daa70095c314a44870394f..5f13f1696d354680418763917084e59864ea3839 100644 (file)
--- a/misc/cgo/test/issue9400/asm_ppc64x.s
+++ b/misc/cgo/test/issue9400/asm_ppc64x.s
@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build ppc64 ppc64le
-// +build gc
+//go:build (ppc64 || ppc64le) && gc
 
 #include "textflag.h"
 

diff --git a/misc/cgo/test/issue9400/asm_riscv64.s b/misc/cgo/test/issue9400/asm_riscv64.s
index 244dadac35097526a7a7d4384aae91d321eb7900..fa34f6bd3754a2f66cc275832bddd00c30949bd2 100644 (file)
--- a/misc/cgo/test/issue9400/asm_riscv64.s
+++ b/misc/cgo/test/issue9400/asm_riscv64.s
@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build riscv64
-// +build gc
+//go:build riscv64 && gc
 
 #include "textflag.h"
 

diff --git a/misc/cgo/test/issue9400/asm_s390x.s b/misc/cgo/test/issue9400/asm_s390x.s
index 4856492958b116f6105c464c810a428819000d1a..2552fa7008f934c6e715afaabafbaa231d85db33 100644 (file)
--- a/misc/cgo/test/issue9400/asm_s390x.s
+++ b/misc/cgo/test/issue9400/asm_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 gc
+//go:build gc
 
 #include "textflag.h"
 

diff --git a/misc/cgo/test/issue9400/gccgo.go b/misc/cgo/test/issue9400/gccgo.go
index e1e805cb5c411000f1e5650ed3df58ff27cdbb03..4dd987bf7495ad904ec7eaaa517114a12b281872 100644 (file)
--- a/misc/cgo/test/issue9400/gccgo.go
+++ b/misc/cgo/test/issue9400/gccgo.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gccgo
-// +build gccgo
 
 package issue9400
 

diff --git a/misc/cgo/test/issue9400/stubs.go b/misc/cgo/test/issue9400/stubs.go
index 56bd6f44cbc05455fbb164cd8c445f6246947228..08cde2e33b418f5baad182b2ad501643f8372b42 100644 (file)
--- a/misc/cgo/test/issue9400/stubs.go
+++ b/misc/cgo/test/issue9400/stubs.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gc
-// +build gc
 
 package issue9400
 

diff --git a/misc/cgo/test/sigaltstack.go b/misc/cgo/test/sigaltstack.go
index 6b371897a73471812c674d44c13d07fcc738c8ed..d468cf82511cfe75b5534d61ef72707bea91aa98 100644 (file)
--- a/misc/cgo/test/sigaltstack.go
+++ b/misc/cgo/test/sigaltstack.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !windows && !android
-// +build !windows,!android
 
 // Test that the Go runtime still works if C code changes the signal stack.
 

diff --git a/misc/cgo/test/sigprocmask.c b/misc/cgo/test/sigprocmask.c
index e77ba5b08ea96de5283b62ddaac841a3c1cac69c..43158332b9bc9eccc55afdcc4dee3b9faa9c99fb 100644 (file)
--- a/misc/cgo/test/sigprocmask.c
+++ b/misc/cgo/test/sigprocmask.c
@@ -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 !windows
+//go:build !windows
 
 #include <errno.h>
 #include <signal.h>

diff --git a/misc/cgo/test/sigprocmask.go b/misc/cgo/test/sigprocmask.go
index 983734cc7b620c16e9a55d4449a8b829e5667d27..6cc04d6855371dfe214b563f12d362ee5cd6dd08 100644 (file)
--- a/misc/cgo/test/sigprocmask.go
+++ b/misc/cgo/test/sigprocmask.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !windows
-// +build !windows
 
 package cgotest
 

diff --git a/misc/cgo/test/test_unix.go b/misc/cgo/test/test_unix.go
index 831b9ca625a1fbb354c30fa5da3c7358b7cc45ba..50fb0d4db2235eda0098b951d7cbdaa7a1d61ae8 100644 (file)
--- a/misc/cgo/test/test_unix.go
+++ b/misc/cgo/test/test_unix.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !windows
-// +build !windows
 
 package cgotest
 

diff --git a/misc/cgo/testcshared/testdata/libgo2/dup2.go b/misc/cgo/testcshared/testdata/libgo2/dup2.go
index dc03633db6f5a334f75d9fd2e07876f6602098bb..ef86083a037316d0bd860c3d28c891b697333d5a 100644 (file)
--- a/misc/cgo/testcshared/testdata/libgo2/dup2.go
+++ b/misc/cgo/testcshared/testdata/libgo2/dup2.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin || dragonfly || freebsd || (linux && !arm64 && !riscv64) || netbsd || openbsd
-// +build darwin dragonfly freebsd linux,!arm64,!riscv64 netbsd openbsd
 
 package main
 

diff --git a/misc/cgo/testcshared/testdata/libgo2/dup3.go b/misc/cgo/testcshared/testdata/libgo2/dup3.go
index 705cdbc4fdeffe15133d20ca4fcaf7fce48f0b91..913c4bbaca0dc3753365d45799e133ceec988653 100644 (file)
--- a/misc/cgo/testcshared/testdata/libgo2/dup3.go
+++ b/misc/cgo/testcshared/testdata/libgo2/dup3.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build (linux && arm64) || (linux && riscv64)
-// +build linux,arm64 linux,riscv64
 
 package main
 

diff --git a/misc/cgo/testcshared/testdata/libgo2/libgo2.go b/misc/cgo/testcshared/testdata/libgo2/libgo2.go
index d8a6c487035776c180658775873ca575ea41d34e..5f6cfd00397af1356712f59d2c7ae8c0f07213d0 100644 (file)
--- a/misc/cgo/testcshared/testdata/libgo2/libgo2.go
+++ b/misc/cgo/testcshared/testdata/libgo2/libgo2.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package main
 

diff --git a/misc/cgo/testgodefs/testdata/anonunion.go b/misc/cgo/testgodefs/testdata/anonunion.go
index 9e9daa662513f9c5594df5727564c7e1e1411625..2c86c5c29ea634473e447aa67bfb9aeb9aef499a 100644 (file)
--- a/misc/cgo/testgodefs/testdata/anonunion.go
+++ b/misc/cgo/testgodefs/testdata/anonunion.go
@@ -1,9 +1,8 @@
 // Copyright 2014 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
-//
+
 //go:build ignore
-// +build ignore
 
 package main
 

diff --git a/misc/cgo/testgodefs/testdata/bitfields.go b/misc/cgo/testgodefs/testdata/bitfields.go
index a7f26dd6d26949cff878ce63696a1d91c89e0c8e..431ffc069685bba40dd3669cbd99cc81a9ca7d00 100644 (file)
--- a/misc/cgo/testgodefs/testdata/bitfields.go
+++ b/misc/cgo/testgodefs/testdata/bitfields.go
@@ -1,9 +1,8 @@
 // Copyright 2020 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
-//
+
 //go:build ignore
-// +build ignore
 
 package main
 

diff --git a/misc/cgo/testgodefs/testdata/fieldtypedef.go b/misc/cgo/testgodefs/testdata/fieldtypedef.go
index 50562538b230f2601e199edee6305b9c2bdad1ef..b0c507477f155e4afa2ae0a1a684e64f48691c14 100644 (file)
--- a/misc/cgo/testgodefs/testdata/fieldtypedef.go
+++ b/misc/cgo/testgodefs/testdata/fieldtypedef.go
@@ -1,9 +1,8 @@
 // Copyright 2018 The Go Authors. All rights reserve d.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
-//
+
 //go:build ignore
-// +build ignore
 
 package main
 

diff --git a/misc/cgo/testgodefs/testdata/issue37479.go b/misc/cgo/testgodefs/testdata/issue37479.go
index ba7185b81f9b63b50165927cb995b01866acdaf3..d54531045f1989599f9e39533fec3b70af7554f4 100644 (file)
--- a/misc/cgo/testgodefs/testdata/issue37479.go
+++ b/misc/cgo/testgodefs/testdata/issue37479.go
@@ -1,9 +1,8 @@
 // Copyright 2020 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
-//
+
 //go:build ignore
-// +build ignore
 
 package main
 

diff --git a/misc/cgo/testgodefs/testdata/issue37621.go b/misc/cgo/testgodefs/testdata/issue37621.go
index 515f0c089f4038f878919e75e8706beba0b5ff16..655e8ae46583b5cca498b7958f5453e189e4b2eb 100644 (file)
--- a/misc/cgo/testgodefs/testdata/issue37621.go
+++ b/misc/cgo/testgodefs/testdata/issue37621.go
@@ -1,9 +1,8 @@
 // Copyright 2020 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
-//
+
 //go:build ignore
-// +build ignore
 
 package main
 

diff --git a/misc/cgo/testgodefs/testdata/issue38649.go b/misc/cgo/testgodefs/testdata/issue38649.go
index 5ef00eb5fe9ba790094d96272be017d97b069dc6..78b5f78eddd86b0e5d4be1fd29ce4687de066083 100644 (file)
--- a/misc/cgo/testgodefs/testdata/issue38649.go
+++ b/misc/cgo/testgodefs/testdata/issue38649.go
@@ -1,9 +1,8 @@
 // Copyright 2020 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
-//
+
 //go:build ignore
-// +build ignore
 
 package main
 

diff --git a/misc/cgo/testgodefs/testdata/issue39534.go b/misc/cgo/testgodefs/testdata/issue39534.go
index e310a81266d97ad981ebb728d584cca2b345fe07..af730e98d94457acc92ce6c7844c450d2e3786c2 100644 (file)
--- a/misc/cgo/testgodefs/testdata/issue39534.go
+++ b/misc/cgo/testgodefs/testdata/issue39534.go
@@ -1,9 +1,8 @@
 // Copyright 2020 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
-//
+
 //go:build ignore
-// +build ignore
 
 package main
 

diff --git a/misc/cgo/testgodefs/testdata/issue48396.go b/misc/cgo/testgodefs/testdata/issue48396.go
index 27c03940b7ab0a06a5a127b1bdfb0a24d3db7d28..81dd2feb800fcbc4c7e6737eac2f3be6f66546e5 100644 (file)
--- a/misc/cgo/testgodefs/testdata/issue48396.go
+++ b/misc/cgo/testgodefs/testdata/issue48396.go
@@ -1,9 +1,8 @@
 // Copyright 2021 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
-//
+
 //go:build ignore
-// +build ignore
 
 package main
 

diff --git a/misc/cgo/testgodefs/testdata/issue8478.go b/misc/cgo/testgodefs/testdata/issue8478.go
index ec3bdcf43ba7fc49dee6686c29d1ace7a5fc5a98..f4ef164bda246d52d50b284fc1755ce342891199 100644 (file)
--- a/misc/cgo/testgodefs/testdata/issue8478.go
+++ b/misc/cgo/testgodefs/testdata/issue8478.go
@@ -1,9 +1,8 @@
 // Copyright 2014 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
-//
+
 //go:build ignore
-// +build ignore
 
 package main
 

diff --git a/misc/cgo/testplugin/testdata/issue22295.pkg/main.go b/misc/cgo/testplugin/testdata/issue22295.pkg/main.go
index eb6064be80b3c6c73c2b84c83abfadc036857392..44b2a2140ea145fe05f3af6fb3f62db51befb70b 100644 (file)
--- a/misc/cgo/testplugin/testdata/issue22295.pkg/main.go
+++ b/misc/cgo/testplugin/testdata/issue22295.pkg/main.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package main
 

diff --git a/misc/cgo/testplugin/testdata/unnamed1/main.go b/misc/cgo/testplugin/testdata/unnamed1/main.go
index 1629f18e01898f3e6e877af50ab86dc5b985844f..1620dc48ce06cf2aa33cf3f94d28c7b83513078d 100644 (file)
--- a/misc/cgo/testplugin/testdata/unnamed1/main.go
+++ b/misc/cgo/testplugin/testdata/unnamed1/main.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package main
 

diff --git a/misc/cgo/testplugin/testdata/unnamed2/main.go b/misc/cgo/testplugin/testdata/unnamed2/main.go
index 35e9f381f9ced830b2f691348c29b087a9fa21b3..027ef6475ce94c20c7f660567cd574cbfa0ad66e 100644 (file)
--- a/misc/cgo/testplugin/testdata/unnamed2/main.go
+++ b/misc/cgo/testplugin/testdata/unnamed2/main.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package main
 

diff --git a/misc/cgo/testshared/testdata/depBase/asm.s b/misc/cgo/testshared/testdata/depBase/asm.s
index 0f1111f3927d3625330bcd04b7f55632a21ad7e8..51adca3a338d1877a863744c752242cf675e79cc 100644 (file)
--- a/misc/cgo/testshared/testdata/depBase/asm.s
+++ b/misc/cgo/testshared/testdata/depBase/asm.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 gc
+//go:build gc
 
 #include "textflag.h"
 

diff --git a/misc/cgo/testshared/testdata/depBase/gccgo.go b/misc/cgo/testshared/testdata/depBase/gccgo.go
index 2c829989e0a87d5eb10f395f880743c2f7825b9d..a59d0b8c3ff56baf9a8eb0a02df9a31fca43c2f0 100644 (file)
--- a/misc/cgo/testshared/testdata/depBase/gccgo.go
+++ b/misc/cgo/testshared/testdata/depBase/gccgo.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gccgo
-// +build gccgo
 
 package depBase
 

diff --git a/misc/cgo/testshared/testdata/depBase/stubs.go b/misc/cgo/testshared/testdata/depBase/stubs.go
index aca7a85f69fbd38ae602c264c244411d6b5de458..c15e4e9a7445259ef638913dd5403ed9b2d4f59f 100644 (file)
--- a/misc/cgo/testshared/testdata/depBase/stubs.go
+++ b/misc/cgo/testshared/testdata/depBase/stubs.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gc
-// +build gc
 
 package depBase
 

diff --git a/misc/cgo/testso/noso_test.go b/misc/cgo/testso/noso_test.go
index 1014534d62cf06962c4f17b96ebc3cfe896ded29..45b13e1928790a7beda31cf8b69f3ee90604a555 100644 (file)
--- a/misc/cgo/testso/noso_test.go
+++ b/misc/cgo/testso/noso_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !cgo
-// +build !cgo
 
 package so_test
 

diff --git a/misc/cgo/testso/so_test.go b/misc/cgo/testso/so_test.go
index 6d14e32dc6caa474d9ca85082407c50db8b5e56c..5c460d21b60cea140175e5d5212b28199fead2e9 100644 (file)
--- a/misc/cgo/testso/so_test.go
+++ b/misc/cgo/testso/so_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build cgo
-// +build cgo
 
 package so_test
 

diff --git a/misc/cgo/testso/testdata/cgoso_c.c b/misc/cgo/testso/testdata/cgoso_c.c
index e5015ed5e8ce414730d7b86357eb005c9859f391..d5fb559f830f694674290f17b78c5b91cb183f25 100644 (file)
--- a/misc/cgo/testso/testdata/cgoso_c.c
+++ b/misc/cgo/testso/testdata/cgoso_c.c
@@ -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 ignore
+//go:build ignore
 
 #ifdef WIN32
 // A Windows DLL is unable to call an arbitrary function in

diff --git a/misc/cgo/testso/testdata/cgoso_unix.go b/misc/cgo/testso/testdata/cgoso_unix.go
index 5164af5b3fbb745929a1a7f59a901e68651bf2fc..ea9cb0a903c6f715431da84d359acf8e1538fb1b 100644 (file)
--- a/misc/cgo/testso/testdata/cgoso_unix.go
+++ b/misc/cgo/testso/testdata/cgoso_unix.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || dragonfly || freebsd || linux || netbsd || solaris
-// +build aix dragonfly freebsd linux netbsd solaris
 
 package cgosotest
 

diff --git a/misc/cgo/testso/testdata/main.go b/misc/cgo/testso/testdata/main.go
index 5e2d6eff862a5befc77a71b0b4d405848daf524f..84382f739c00c9249011be97a11ae01764944e08 100644 (file)
--- a/misc/cgo/testso/testdata/main.go
+++ b/misc/cgo/testso/testdata/main.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package main
 

diff --git a/misc/cgo/testsovar/noso_test.go b/misc/cgo/testsovar/noso_test.go
index 1014534d62cf06962c4f17b96ebc3cfe896ded29..45b13e1928790a7beda31cf8b69f3ee90604a555 100644 (file)
--- a/misc/cgo/testsovar/noso_test.go
+++ b/misc/cgo/testsovar/noso_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !cgo
-// +build !cgo
 
 package so_test
 

diff --git a/misc/cgo/testsovar/so_test.go b/misc/cgo/testsovar/so_test.go
index 6d14e32dc6caa474d9ca85082407c50db8b5e56c..5c460d21b60cea140175e5d5212b28199fead2e9 100644 (file)
--- a/misc/cgo/testsovar/so_test.go
+++ b/misc/cgo/testsovar/so_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build cgo
-// +build cgo
 
 package so_test
 

diff --git a/misc/cgo/testsovar/testdata/cgoso_c.c b/misc/cgo/testsovar/testdata/cgoso_c.c
index a448c013428c9807dcec8a76217383ea82808a19..36f4d570eea5a645b518423cf98e8714b57fd5ab 100644 (file)
--- a/misc/cgo/testsovar/testdata/cgoso_c.c
+++ b/misc/cgo/testsovar/testdata/cgoso_c.c
@@ -2,6 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build ignore
+//go:build ignore
 
 const char *exported_var = "Hello world";

diff --git a/misc/cgo/testsovar/testdata/cgoso_c.h b/misc/cgo/testsovar/testdata/cgoso_c.h
index 640db7b396a1cc8e832baeafa7327b43545fd8e7..eccd8c0d0cd4a85ae14023fb18cb1757316182ef 100644 (file)
--- a/misc/cgo/testsovar/testdata/cgoso_c.h
+++ b/misc/cgo/testsovar/testdata/cgoso_c.h
@@ -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 ignore
+//go:build ignore
 
 #ifdef WIN32
 #if defined(EXPORT_DLL)

diff --git a/misc/cgo/testsovar/testdata/main.go b/misc/cgo/testsovar/testdata/main.go
index 462e99389d19b335f18e445a512894d548a7d4cd..018b835c6c689e55252d85edcb58949e44380255 100644 (file)
--- a/misc/cgo/testsovar/testdata/main.go
+++ b/misc/cgo/testsovar/testdata/main.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 package main
 

diff --git a/misc/cgo/testtls/tls_test.go b/misc/cgo/testtls/tls_test.go
index a3b67c004413aafcf305109fb893dd5ed0de09c8..9d660b8337a2acad48e6c9becfb7f4f89f40d3d5 100644 (file)
--- a/misc/cgo/testtls/tls_test.go
+++ b/misc/cgo/testtls/tls_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !windows
-// +build !windows
 
 package cgotlstest