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>

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

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
 

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>

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>

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
 

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
 

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"

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
 

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.
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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.

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>

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.

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
 

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
 

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>

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)

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
 

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
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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
 

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
 

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.
 

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>

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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"
 

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
 

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
 

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
 

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
 

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

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
 

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
 

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
 

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
 

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";

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)

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
 

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