[dev.boringcrypto] all: convert +build to //go:build lines in boring-specific files

This makes the latest Go 1.18 cmd/dist happier.

Change-Id: If1894ce4f60a0b604a2bd889974ddb16c405e0c7
Reviewed-on: https://go-review.googlesource.com/c/go/+/359474
Trust: Russ Cox <rsc@golang.org>
Trust: Damien Neil <dneil@google.com>
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Damien Neil <dneil@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>

diff --git a/src/crypto/boring/notboring_test.go b/src/crypto/boring/notboring_test.go
index 385a384dd756df9d36ccdb28ad78941110763ea1..e69a3a93fdf79bcb367d23fe61228945dab07474 100644 (file)
--- a/src/crypto/boring/notboring_test.go
+++ b/src/crypto/boring/notboring_test.go
@@ -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 !boringcrypto
 // +build !boringcrypto
 
 package boring_test

diff --git a/src/crypto/internal/boring/aes.go b/src/crypto/internal/boring/aes.go
index 504a841cd82719dbd66c516680c5c839c3d5fb86..b5d360151cc300041924b8f47816d748f294ffbe 100644 (file)
--- a/src/crypto/internal/boring/aes.go
+++ b/src/crypto/internal/boring/aes.go
@@ -2,10 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build linux,amd64
-// +build !android
-// +build !cmd_go_bootstrap
-// +build !msan
+//go:build linux && amd64 && !android && !cmd_go_bootstrap && !msan
+// +build linux,amd64,!android,!cmd_go_bootstrap,!msan
 
 package boring
 

diff --git a/src/crypto/internal/boring/boring.go b/src/crypto/internal/boring/boring.go
index 9ccad7eb5d34cbd9fd49226ca973504e85c81ca1..f34243fe2696d9e5e4d516753935b26bf61e0062 100644 (file)
--- a/src/crypto/internal/boring/boring.go
+++ b/src/crypto/internal/boring/boring.go
@@ -2,10 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build linux,amd64
-// +build !android
-// +build !cmd_go_bootstrap
-// +build !msan
+//go:build linux && amd64 && !android && !cmd_go_bootstrap && !msan
+// +build linux,amd64,!android,!cmd_go_bootstrap,!msan
 
 package boring
 

diff --git a/src/crypto/internal/boring/ecdsa.go b/src/crypto/internal/boring/ecdsa.go
index 4fcba4be7293cd69be61258ade0b45a4cebc8c5a..b9c68a97afffd7ebfdee332c07d36f7ee05e30ae 100644 (file)
--- a/src/crypto/internal/boring/ecdsa.go
+++ b/src/crypto/internal/boring/ecdsa.go
@@ -2,10 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build linux,amd64
-// +build !android
-// +build !cmd_go_bootstrap
-// +build !msan
+//go:build linux && amd64 && !android && !cmd_go_bootstrap && !msan
+// +build linux,amd64,!android,!cmd_go_bootstrap,!msan
 
 package boring
 

diff --git a/src/crypto/internal/boring/hmac.go b/src/crypto/internal/boring/hmac.go
index 01b5844e5f28e22b81e7d858475b4979f0c5ec71..be0670c05a4ce0068280de912e259629c09f4456 100644 (file)
--- a/src/crypto/internal/boring/hmac.go
+++ b/src/crypto/internal/boring/hmac.go
@@ -2,10 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build linux,amd64
-// +build !android
-// +build !cmd_go_bootstrap
-// +build !msan
+//go:build linux && amd64 && !android && !cmd_go_bootstrap && !msan
+// +build linux,amd64,!android,!cmd_go_bootstrap,!msan
 
 package boring
 

diff --git a/src/crypto/internal/boring/notboring.go b/src/crypto/internal/boring/notboring.go
index c21cb3cd55d4fcb7e86fd253de23e773790ee0c6..2e2414c73b1ffedfcce275806dfe49c9ce22a88e 100644 (file)
--- a/src/crypto/internal/boring/notboring.go
+++ b/src/crypto/internal/boring/notboring.go
@@ -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 !linux || !amd64 || !cgo || android || cmd_go_bootstrap || msan
 // +build !linux !amd64 !cgo android cmd_go_bootstrap msan
 
 package boring

diff --git a/src/crypto/internal/boring/rand.go b/src/crypto/internal/boring/rand.go
index c3fc27cc08b01f8f712c89f38b3bcf9dab1bb0c0..57937eb3c8d98c7dc2d6063e2566e3b2c94e4d04 100644 (file)
--- a/src/crypto/internal/boring/rand.go
+++ b/src/crypto/internal/boring/rand.go
@@ -2,10 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build linux,amd64
-// +build !android
-// +build !cmd_go_bootstrap
-// +build !msan
+//go:build linux && amd64 && !android && !cmd_go_bootstrap && !msan
+// +build linux,amd64,!android,!cmd_go_bootstrap,!msan
 
 package boring
 

diff --git a/src/crypto/internal/boring/rsa.go b/src/crypto/internal/boring/rsa.go
index a10831dd00d47c93cd43c82d6065aaedd3f761c1..327dfa0309ef10dfb0e7b11d77f2213e464ee5b4 100644 (file)
--- a/src/crypto/internal/boring/rsa.go
+++ b/src/crypto/internal/boring/rsa.go
@@ -2,10 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build linux,amd64
-// +build !android
-// +build !cmd_go_bootstrap
-// +build !msan
+//go:build linux && amd64 && !android && !cmd_go_bootstrap && !msan
+// +build linux,amd64,!android,!cmd_go_bootstrap,!msan
 
 package boring
 

diff --git a/src/crypto/internal/boring/sha.go b/src/crypto/internal/boring/sha.go
index 5ca158ca32c6649b26651be8de9a1a013dd85f48..4672119df1b467499167ae6fe98377c71511deba 100644 (file)
--- a/src/crypto/internal/boring/sha.go
+++ b/src/crypto/internal/boring/sha.go
@@ -2,10 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build linux,amd64
-// +build !android
-// +build !cmd_go_bootstrap
-// +build !msan
+//go:build linux && amd64 && !android && !cmd_go_bootstrap && !msan
+// +build linux,amd64,!android,!cmd_go_bootstrap,!msan
 
 package boring
 

diff --git a/src/crypto/internal/boring/sig/sig_other.s b/src/crypto/internal/boring/sig/sig_other.s
index 2eb31734ef5e10b668a4c8ed28d159ee0644436b..2bbb1df3013f7ae8ac23684d9ade9fef739563cd 100644 (file)
--- a/src/crypto/internal/boring/sig/sig_other.s
+++ b/src/crypto/internal/boring/sig/sig_other.s
@@ -7,6 +7,7 @@
 // search a particular binary to see if they are present.
 // On other platforms (those using this source file), they don't.
 
+//go:build !amd64
 // +build !amd64
 
 TEXT ·BoringCrypto(SB),$0

diff --git a/src/crypto/sha1/boring.go b/src/crypto/sha1/boring.go
index 44c26092ee01d5c9dff2b88856dda4268227b041..1cacf93f9b4b359c7ca2f64a7b58df5ec509c97f 100644 (file)
--- a/src/crypto/sha1/boring.go
+++ b/src/crypto/sha1/boring.go
@@ -6,6 +6,7 @@
 // cmd/internal/boring is not even imported, so that we don't
 // have to maintain changes to cmd/dist's deps graph.
 
+//go:build !cmd_go_bootstrap
 // +build !cmd_go_bootstrap
 
 package sha1

diff --git a/src/crypto/sha1/notboring.go b/src/crypto/sha1/notboring.go
index 9726fcd268ea18fb8597f26095c17c90a6da0649..2412c9062dd03b19568e859851dc14e40a23da28 100644 (file)
--- a/src/crypto/sha1/notboring.go
+++ b/src/crypto/sha1/notboring.go
@@ -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 cmd_go_bootstrap
 // +build cmd_go_bootstrap
 
 package sha1