all: drop old +build lines

Running 'go fix' on the cmd+std packages handled much of this change.

Also update code generators to use only the new go:build lines,
not the old +build ones.

For #41184.
For #60268.

Change-Id: If35532abe3012e7357b02c79d5992ff5ac37ca23
Cq-Include-Trybots: luci.golang.try:gotip-linux-386-longtest,gotip-linux-amd64-longtest,gotip-windows-amd64-longtest
Reviewed-on: https://go-review.googlesource.com/c/go/+/536237
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>

diff --git a/src/cmd/compile/internal/ssa/_gen/cover.bash b/src/cmd/compile/internal/ssa/_gen/cover.bash
index 7311cfb5f394d5fd051cb3e50db9575315f9e7d0..733f9db2c2e43b0a6bce51038f12f529991fb0cb 100755 (executable)
--- a/src/cmd/compile/internal/ssa/_gen/cover.bash
+++ b/src/cmd/compile/internal/ssa/_gen/cover.bash
@@ -12,7 +12,7 @@
 # regular 'go run .' usage to run the generator.
 
 cat >main_test.go <<-EOF
-       // +build ignore
+       //go:build ignore
 
        package main
 

diff --git a/src/cmd/compile/internal/typecheck/_builtin/coverage.go b/src/cmd/compile/internal/typecheck/_builtin/coverage.go
index ea4462dd97856aee48f1993bb61fb14ab8759519..02226356bc9873df39ecb1b7dc4107e1a73bccc4 100644 (file)
--- a/src/cmd/compile/internal/typecheck/_builtin/coverage.go
+++ b/src/cmd/compile/internal/typecheck/_builtin/coverage.go
@@ -7,7 +7,6 @@
 // to avoid depending on having a working compiler binary.
 
 //go:build ignore
-// +build ignore
 
 package coverage
 

diff --git a/src/cmd/dist/notgo120.go b/src/cmd/dist/notgo120.go
index dd7657112fc37d9bc238cb3dce07fb9529ea0f4d..0b89ab3c022a5d514f6f0503f3dd89d28ee1b302 100644 (file)
--- a/src/cmd/dist/notgo120.go
+++ b/src/cmd/dist/notgo120.go
@@ -17,6 +17,5 @@
 // why Go moved on from Go 1.4 for bootstrap.
 
 //go:build !go1.20
-// +build !go1.20
 
 package building_Go_requires_Go_1_20_6_or_later

diff --git a/src/cmd/dist/sys_default.go b/src/cmd/dist/sys_default.go
index e87c84ce3eea4ce07ba6ab387df7a7c3871d2f2c..ae102270c3401991ec8f823e7405ec2ce3ea8200 100644 (file)
--- a/src/cmd/dist/sys_default.go
+++ b/src/cmd/dist/sys_default.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !windows
-// +build !windows
 
 package main
 

diff --git a/src/cmd/dist/util_gc.go b/src/cmd/dist/util_gc.go
index 875784d3830bccea2d23a7fed4134e538c2d1077..6efdf23e6049ebd290d83c464af15482f63c5717 100644 (file)
--- a/src/cmd/dist/util_gc.go
+++ b/src/cmd/dist/util_gc.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gc
-// +build gc
 
 package main
 

diff --git a/src/cmd/dist/util_gccgo.go b/src/cmd/dist/util_gccgo.go
index 3255b8036526688e1495ec2b6017d3ab2057b8c9..2f7af7ed6628b3fce1e8511669ea1df476a4e1da 100644 (file)
--- a/src/cmd/dist/util_gccgo.go
+++ b/src/cmd/dist/util_gccgo.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gccgo
-// +build gccgo
 
 package main
 

diff --git a/src/cmd/dist/vfp_arm.s b/src/cmd/dist/vfp_arm.s
index 525ee9b3661f529cab4e62ef676e2fddfa4d4458..37fb4061af9122f4da626553cdfdaa52c7260862 100644 (file)
--- a/src/cmd/dist/vfp_arm.s
+++ b/src/cmd/dist/vfp_arm.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gc
-// +build gc
 
 #include "textflag.h"
 

diff --git a/src/cmd/dist/vfp_default.s b/src/cmd/dist/vfp_default.s
index 0c1e16b0aa052380bcfc6f541c49c84c4cf74467..a766edac286e70cb70fc4f07094f61f94602042c 100644 (file)
--- a/src/cmd/dist/vfp_default.s
+++ b/src/cmd/dist/vfp_default.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gc && !arm
-// +build gc,!arm
 
 #include "textflag.h"
 

diff --git a/src/cmd/go/internal/modcmd/vendor.go b/src/cmd/go/internal/modcmd/vendor.go
index e95dfbfbb7d9582c5a5cd5587e06ddd3e4ea9185..3db85bda53070712a868efb02d5d0969e74023a3 100644 (file)
--- a/src/cmd/go/internal/modcmd/vendor.go
+++ b/src/cmd/go/internal/modcmd/vendor.go
@@ -299,7 +299,7 @@ func vendorPkg(vdir, pkg string) {
        // a MultiplePackageError on an otherwise valid package: the package could
        // have different names for GOOS=windows and GOOS=mac for example. On the
        // other hand if there's a NoGoError, the package might have source files
-       // specifying "// +build ignore" those packages should be skipped because
+       // specifying "//go:build ignore" those packages should be skipped because
        // embeds from ignored files can't be used.
        // TODO(#42504): Find a better way to avoid errors from ImportDir. We'll
        // need to figure this out when we switch to PackagesAndErrors as per the

diff --git a/src/cmd/go/internal/modload/import.go b/src/cmd/go/internal/modload/import.go
index cc6a482fd450d0ce0602b28d5e6afc8fd3002750..7cd5fcf36a67ace4635a88dd2a88454b3030b840 100644 (file)
--- a/src/cmd/go/internal/modload/import.go
+++ b/src/cmd/go/internal/modload/import.go
@@ -706,7 +706,7 @@ func dirInModule(path, mpath, mdir string, isLocal bool) (dir string, haveGoFile
        // Now committed to returning dir (not "").
 
        // Are there Go source files in the directory?
-       // We don't care about build tags, not even "+build ignore".
+       // We don't care about build tags, not even "go:build ignore".
        // We're just looking for a plausible directory.
        haveGoFiles, err = haveGoFilesCache.Do(dir, func() (bool, error) {
                // modindex.GetPackage will return ErrNotIndexed for any directories which

diff --git a/src/cmd/internal/goobj/mkbuiltin.go b/src/cmd/internal/goobj/mkbuiltin.go
index aefb19b5e3703cb1e70ba0f30e65681c7a0ba152..5ddf0e7d9a95627125a0ac8e6a1405c92f6bbcb0 100644 (file)
--- a/src/cmd/internal/goobj/mkbuiltin.go
+++ b/src/cmd/internal/goobj/mkbuiltin.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 // Generate builtinlist.go from cmd/compile/internal/typecheck/builtin/runtime.go.
 

diff --git a/src/cmd/internal/notsha256/sha256block_386.s b/src/cmd/internal/notsha256/sha256block_386.s
index f2ba7d7a9b7a5b22abc983cef22aeb68eb580eef..0e27fa02d7e708cb9ba3ac4a8cf20e32fd39ffd0 100644 (file)
--- a/src/cmd/internal/notsha256/sha256block_386.s
+++ b/src/cmd/internal/notsha256/sha256block_386.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !purego
-// +build !purego
 
 // SHA256 block routine. See sha256block.go for Go equivalent.
 //

diff --git a/src/cmd/internal/notsha256/sha256block_amd64.go b/src/cmd/internal/notsha256/sha256block_amd64.go
index 27b84a86b129797a9205c491ef2174b61d86f1c8..6a615e096f82a6770ab058375ec3d3d89cdb55cb 100644 (file)
--- a/src/cmd/internal/notsha256/sha256block_amd64.go
+++ b/src/cmd/internal/notsha256/sha256block_amd64.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !purego
-// +build !purego
 
 package notsha256
 

diff --git a/src/cmd/internal/notsha256/sha256block_amd64.s b/src/cmd/internal/notsha256/sha256block_amd64.s
index 36ea74451d15e77e10a617e8c5f3c69ae54c3244..b25c979e9bc2fe0eb152bcb05c01486617433cf4 100644 (file)
--- a/src/cmd/internal/notsha256/sha256block_amd64.s
+++ b/src/cmd/internal/notsha256/sha256block_amd64.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !purego
-// +build !purego
 
 #include "textflag.h"
 

diff --git a/src/cmd/internal/notsha256/sha256block_decl.go b/src/cmd/internal/notsha256/sha256block_decl.go
index da66bdd26abda46d9f29cf00909f656a1ad7bb91..ab3f7d294be7d72efb34107b2447652f1675b89c 100644 (file)
--- a/src/cmd/internal/notsha256/sha256block_decl.go
+++ b/src/cmd/internal/notsha256/sha256block_decl.go
@@ -3,8 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !purego && (386 || amd64 || ppc64le || ppc64)
-// +build !purego
-// +build 386 amd64 ppc64le ppc64
 
 package notsha256
 

diff --git a/src/cmd/internal/notsha256/sha256block_generic.go b/src/cmd/internal/notsha256/sha256block_generic.go
index 2664722bc2f7a41a4742fe271161bbd2a8205ce9..76d53728ab378533e8d1bfa4cf50da4d575a0837 100644 (file)
--- a/src/cmd/internal/notsha256/sha256block_generic.go
+++ b/src/cmd/internal/notsha256/sha256block_generic.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build purego || (!amd64 && !386 && !ppc64le && !ppc64)
-// +build purego !amd64,!386,!ppc64le,!ppc64
 
 package notsha256
 

diff --git a/src/cmd/internal/notsha256/sha256block_ppc64x.s b/src/cmd/internal/notsha256/sha256block_ppc64x.s
index ea4417d6c6b6d74d77bde65d7a0ba71eb003eb67..93e85509eaa2f2ce7b7ad05f53c3947acec39dca 100644 (file)
--- a/src/cmd/internal/notsha256/sha256block_ppc64x.s
+++ b/src/cmd/internal/notsha256/sha256block_ppc64x.s
@@ -9,8 +9,6 @@
 //
 
 //go:build !purego && (ppc64 || ppc64le)
-// +build !purego
-// +build ppc64 ppc64le
 
 // Based on CRYPTOGAMS code with the following comment:
 // # ====================================================================

diff --git a/src/cmd/internal/obj/stringer.go b/src/cmd/internal/obj/stringer.go
index a4d507d49aa40924615a590d111743461a3ab5c2..b2b0df83ad0d9771c85551f448c6e934ef7a4c4c 100644 (file)
--- a/src/cmd/internal/obj/stringer.go
+++ b/src/cmd/internal/obj/stringer.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 // This is a mini version of the stringer tool customized for the Anames table
 // in the architecture support for obj.

diff --git a/src/cmd/link/internal/ld/elf_test.go b/src/cmd/link/internal/ld/elf_test.go
index f5f5e8ef4ebfa02292d89f142a2fd5dcefa38423..e535af6a1c2e6d4db0f5e23f8ab4b4091e8a94ca 100644 (file)
--- a/src/cmd/link/internal/ld/elf_test.go
+++ b/src/cmd/link/internal/ld/elf_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build cgo
-// +build cgo
 
 package ld
 

diff --git a/src/cmd/link/internal/ld/execarchive.go b/src/cmd/link/internal/ld/execarchive.go
index a9376e96a4b3d1f62bfc98582126f32ac4f2dbc5..7a19567a6c956c5899c0300010d9845f9aa56c90 100644 (file)
--- a/src/cmd/link/internal/ld/execarchive.go
+++ b/src/cmd/link/internal/ld/execarchive.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !wasm && !windows
-// +build !wasm,!windows
 
 package ld
 

diff --git a/src/cmd/link/internal/ld/execarchive_noexec.go b/src/cmd/link/internal/ld/execarchive_noexec.go
index 5e1f2669d3c67fc942458bacc511066df7108982..ada3e9f74aa80ae5d663e747a81f0f70187eba06 100644 (file)
--- a/src/cmd/link/internal/ld/execarchive_noexec.go
+++ b/src/cmd/link/internal/ld/execarchive_noexec.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build wasm || windows
-// +build wasm windows
 
 package ld
 

diff --git a/src/crypto/boring/notboring_test.go b/src/crypto/boring/notboring_test.go
index ffe18e9109ab0bf8cabcab534675feab1a8a5975..070162846499ab035345c6f5e2acf5d1fc2894f4 100644 (file)
--- a/src/crypto/boring/notboring_test.go
+++ b/src/crypto/boring/notboring_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build (goexperiment.boringcrypto && !boringcrypto) || (!goexperiment.boringcrypto && boringcrypto)
-// +build goexperiment.boringcrypto,!boringcrypto !goexperiment.boringcrypto,boringcrypto
 
 package boring_test
 

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

diff --git a/src/crypto/internal/edwards25519/field/fe_arm64.s b/src/crypto/internal/edwards25519/field/fe_arm64.s
index 751ab2ada3a350dfcd3d469ed1c63461df831def..3126a434191c0c638a4b1b5181b8a0ce6700f671 100644 (file)
--- a/src/crypto/internal/edwards25519/field/fe_arm64.s
+++ b/src/crypto/internal/edwards25519/field/fe_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 arm64,gc,!purego
+//go:build arm64 && gc && !purego
 
 #include "textflag.h"
 

diff --git a/src/internal/goexperiment/exp_arenas_off.go b/src/internal/goexperiment/exp_arenas_off.go
index 9e40ebc37b083d3fe0a70a9d4bbd03936c47974d..01f5332e5cb6fb8f68ae393879a7572e855ca057 100644 (file)
--- a/src/internal/goexperiment/exp_arenas_off.go
+++ b/src/internal/goexperiment/exp_arenas_off.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build !goexperiment.arenas
-// +build !goexperiment.arenas
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_arenas_on.go b/src/internal/goexperiment/exp_arenas_on.go
index 92ef748f629d18e64decd823979b67fe78ce74bd..609dfbca99fece662285243b04722d5dbbaf3551 100644 (file)
--- a/src/internal/goexperiment/exp_arenas_on.go
+++ b/src/internal/goexperiment/exp_arenas_on.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build goexperiment.arenas
-// +build goexperiment.arenas
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_boringcrypto_off.go b/src/internal/goexperiment/exp_boringcrypto_off.go
index 020c75bd532c51261fee891a5cd31f8ff14e165b..de712670fd6e9a70d067d2a0d9799df8d2e2e7e2 100644 (file)
--- a/src/internal/goexperiment/exp_boringcrypto_off.go
+++ b/src/internal/goexperiment/exp_boringcrypto_off.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build !goexperiment.boringcrypto
-// +build !goexperiment.boringcrypto
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_boringcrypto_on.go b/src/internal/goexperiment/exp_boringcrypto_on.go
index 1454329a463f5f570f16a7feeac6788b031c8389..ce476faa057144e1390f6b2b946eb8d3bc8adcb3 100644 (file)
--- a/src/internal/goexperiment/exp_boringcrypto_on.go
+++ b/src/internal/goexperiment/exp_boringcrypto_on.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build goexperiment.boringcrypto
-// +build goexperiment.boringcrypto
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_cacheprog_off.go b/src/internal/goexperiment/exp_cacheprog_off.go
index 29aa86982388d9672b94d517f3ac76df9737c00d..276855c7d6f587d056b175e4f35b200a15057401 100644 (file)
--- a/src/internal/goexperiment/exp_cacheprog_off.go
+++ b/src/internal/goexperiment/exp_cacheprog_off.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build !goexperiment.cacheprog
-// +build !goexperiment.cacheprog
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_cacheprog_on.go b/src/internal/goexperiment/exp_cacheprog_on.go
index 121b299b00b257d44ca06dedb56fed76435bfb18..b959dd68b9f22e6d0c8df5b51578b23f7f47bfbd 100644 (file)
--- a/src/internal/goexperiment/exp_cacheprog_on.go
+++ b/src/internal/goexperiment/exp_cacheprog_on.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build goexperiment.cacheprog
-// +build goexperiment.cacheprog
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_cgocheck2_off.go b/src/internal/goexperiment/exp_cgocheck2_off.go
index 77aa53830909a234bb85f98b8570d11a7986595f..e99ad0786121eb9573b49d1325b615bee85326e6 100644 (file)
--- a/src/internal/goexperiment/exp_cgocheck2_off.go
+++ b/src/internal/goexperiment/exp_cgocheck2_off.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build !goexperiment.cgocheck2
-// +build !goexperiment.cgocheck2
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_cgocheck2_on.go b/src/internal/goexperiment/exp_cgocheck2_on.go
index 6201249ca57c3829b7dd170ebef57efe32d0b3d2..f6d1790d4ca690440595caaac27aa6a04b3d5e40 100644 (file)
--- a/src/internal/goexperiment/exp_cgocheck2_on.go
+++ b/src/internal/goexperiment/exp_cgocheck2_on.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build goexperiment.cgocheck2
-// +build goexperiment.cgocheck2
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_coverageredesign_off.go b/src/internal/goexperiment/exp_coverageredesign_off.go
index 95d3a6c4aeaaa6ccfbfab01066176a4f3de88b2d..2c33177322d1f455b1c2f7e374c8a60585dafb18 100644 (file)
--- a/src/internal/goexperiment/exp_coverageredesign_off.go
+++ b/src/internal/goexperiment/exp_coverageredesign_off.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build !goexperiment.coverageredesign
-// +build !goexperiment.coverageredesign
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_coverageredesign_on.go b/src/internal/goexperiment/exp_coverageredesign_on.go
index 330a234f20a7f192f075210caf99478fa44f0272..3fc6c2f70a9ab58bb154d414008c649598493b55 100644 (file)
--- a/src/internal/goexperiment/exp_coverageredesign_on.go
+++ b/src/internal/goexperiment/exp_coverageredesign_on.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build goexperiment.coverageredesign
-// +build goexperiment.coverageredesign
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_fieldtrack_off.go b/src/internal/goexperiment/exp_fieldtrack_off.go
index e5e132660e183637eed13c61ed1495bfcb7a575c..ccced94cb0d94d75a26b4b77a6afcc2be2bdfe1d 100644 (file)
--- a/src/internal/goexperiment/exp_fieldtrack_off.go
+++ b/src/internal/goexperiment/exp_fieldtrack_off.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build !goexperiment.fieldtrack
-// +build !goexperiment.fieldtrack
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_fieldtrack_on.go b/src/internal/goexperiment/exp_fieldtrack_on.go
index 0d8c447246ebf2760545ce85fba163f9a306c1ba..a49756750a3b11a9134b7d36ced37725dc2661a4 100644 (file)
--- a/src/internal/goexperiment/exp_fieldtrack_on.go
+++ b/src/internal/goexperiment/exp_fieldtrack_on.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build goexperiment.fieldtrack
-// +build goexperiment.fieldtrack
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_heapminimum512kib_off.go b/src/internal/goexperiment/exp_heapminimum512kib_off.go
index 09da431b40711348ad6a1a2c90a89159eeec5690..d67c5bb6747f4f56719cb5a847d332a1bf69c214 100644 (file)
--- a/src/internal/goexperiment/exp_heapminimum512kib_off.go
+++ b/src/internal/goexperiment/exp_heapminimum512kib_off.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build !goexperiment.heapminimum512kib
-// +build !goexperiment.heapminimum512kib
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_heapminimum512kib_on.go b/src/internal/goexperiment/exp_heapminimum512kib_on.go
index bab684b5e680a5d601dde2cadc47d7ce85219cc9..2d29c98e1b110394957ad21e7538c36e6c749673 100644 (file)
--- a/src/internal/goexperiment/exp_heapminimum512kib_on.go
+++ b/src/internal/goexperiment/exp_heapminimum512kib_on.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build goexperiment.heapminimum512kib
-// +build goexperiment.heapminimum512kib
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_loopvar_off.go b/src/internal/goexperiment/exp_loopvar_off.go
index 1cd7ee15d75528f7422bb2ac99e99ae5a61ce8f7..cfede5405268d73e7774b6f0463b652c385795d0 100644 (file)
--- a/src/internal/goexperiment/exp_loopvar_off.go
+++ b/src/internal/goexperiment/exp_loopvar_off.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build !goexperiment.loopvar
-// +build !goexperiment.loopvar
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_loopvar_on.go b/src/internal/goexperiment/exp_loopvar_on.go
index e3c8980c1ec0e3aed5382f8aa7e16e3a2fb9b0c0..e158e0a666ab077e19c9df3ae700dcbeefb7ccc1 100644 (file)
--- a/src/internal/goexperiment/exp_loopvar_on.go
+++ b/src/internal/goexperiment/exp_loopvar_on.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build goexperiment.loopvar
-// +build goexperiment.loopvar
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_newinliner_off.go b/src/internal/goexperiment/exp_newinliner_off.go
index 307c651b7a1a94998981e4fc8985552576524cb7..d94e736528f60bd7b6cc9e78dcd3fc7ff1dbc0ef 100644 (file)
--- a/src/internal/goexperiment/exp_newinliner_off.go
+++ b/src/internal/goexperiment/exp_newinliner_off.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build !goexperiment.newinliner
-// +build !goexperiment.newinliner
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_newinliner_on.go b/src/internal/goexperiment/exp_newinliner_on.go
index 59f400ff57994ff3741f0c49124a8eeb7c8dd5f6..6777dbc048759847ba0b687f1c2b63b811af2bf8 100644 (file)
--- a/src/internal/goexperiment/exp_newinliner_on.go
+++ b/src/internal/goexperiment/exp_newinliner_on.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build goexperiment.newinliner
-// +build goexperiment.newinliner
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_pagetrace_off.go b/src/internal/goexperiment/exp_pagetrace_off.go
index 789e88332dc3d49b310d6708d4a990da3229104a..142be47d963d370f971ffa868bb5d777491a4d98 100644 (file)
--- a/src/internal/goexperiment/exp_pagetrace_off.go
+++ b/src/internal/goexperiment/exp_pagetrace_off.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build !goexperiment.pagetrace
-// +build !goexperiment.pagetrace
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_pagetrace_on.go b/src/internal/goexperiment/exp_pagetrace_on.go
index ea72b54863dc165fecf816d36e945f206f39a658..f3b1614789012f3e54130137a37e0503fac8a477 100644 (file)
--- a/src/internal/goexperiment/exp_pagetrace_on.go
+++ b/src/internal/goexperiment/exp_pagetrace_on.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build goexperiment.pagetrace
-// +build goexperiment.pagetrace
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_preemptibleloops_off.go b/src/internal/goexperiment/exp_preemptibleloops_off.go
index 7a26088e8099af9be1d08a27f5bfcbb9fb7c60f2..cddcc1b8cc20328acedc74faab8516a9ba8c84a5 100644 (file)
--- a/src/internal/goexperiment/exp_preemptibleloops_off.go
+++ b/src/internal/goexperiment/exp_preemptibleloops_off.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build !goexperiment.preemptibleloops
-// +build !goexperiment.preemptibleloops
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_preemptibleloops_on.go b/src/internal/goexperiment/exp_preemptibleloops_on.go
index a9ca28c57cf8cc9d35653c61497a1b872e76fc2e..7f474c035772586662ba4c53832745df14e41f48 100644 (file)
--- a/src/internal/goexperiment/exp_preemptibleloops_on.go
+++ b/src/internal/goexperiment/exp_preemptibleloops_on.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build goexperiment.preemptibleloops
-// +build goexperiment.preemptibleloops
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_range_off.go b/src/internal/goexperiment/exp_range_off.go
index 4afb988ea7e529932bfc3d17a45ead22368f38f8..82f5dc71b2832031190796247a681ebdbfa64bc3 100644 (file)
--- a/src/internal/goexperiment/exp_range_off.go
+++ b/src/internal/goexperiment/exp_range_off.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build !goexperiment.range
-// +build !goexperiment.range
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_range_on.go b/src/internal/goexperiment/exp_range_on.go
index 67317593d3db05ddb1daab1c6e2722af3a8b7c20..1d0f30f49f83ed71b3aac9b01ffd39762dc82733 100644 (file)
--- a/src/internal/goexperiment/exp_range_on.go
+++ b/src/internal/goexperiment/exp_range_on.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build goexperiment.range
-// +build goexperiment.range
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_regabiargs_off.go b/src/internal/goexperiment/exp_regabiargs_off.go
index 31a139bbf19a7eb855919be770091b8ae0f5bee0..a8c8536fa01c6934ba7d6f0f079855527dbbf1ed 100644 (file)
--- a/src/internal/goexperiment/exp_regabiargs_off.go
+++ b/src/internal/goexperiment/exp_regabiargs_off.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build !goexperiment.regabiargs
-// +build !goexperiment.regabiargs
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_regabiargs_on.go b/src/internal/goexperiment/exp_regabiargs_on.go
index 9b26f3c9cb2dd4e3fdb15e908e0feae6357c8a6b..def3b9400475ca2c518c2fdc5456ffd5be0eb27f 100644 (file)
--- a/src/internal/goexperiment/exp_regabiargs_on.go
+++ b/src/internal/goexperiment/exp_regabiargs_on.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build goexperiment.regabiargs
-// +build goexperiment.regabiargs
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_regabiwrappers_off.go b/src/internal/goexperiment/exp_regabiwrappers_off.go
index bfa0fa37798739050d47b941fb07147cc95a17b8..a65ed3649d6251d3bc6e65eae8141ad139a1462e 100644 (file)
--- a/src/internal/goexperiment/exp_regabiwrappers_off.go
+++ b/src/internal/goexperiment/exp_regabiwrappers_off.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build !goexperiment.regabiwrappers
-// +build !goexperiment.regabiwrappers
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_regabiwrappers_on.go b/src/internal/goexperiment/exp_regabiwrappers_on.go
index 11ffffbbff63f584e2c99006eb2793701eedf71f..d525c9a86d15ec35fca72c806fe2e2b58ccb0d66 100644 (file)
--- a/src/internal/goexperiment/exp_regabiwrappers_on.go
+++ b/src/internal/goexperiment/exp_regabiwrappers_on.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build goexperiment.regabiwrappers
-// +build goexperiment.regabiwrappers
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_staticlockranking_off.go b/src/internal/goexperiment/exp_staticlockranking_off.go
index 3d546c04b40de6fb58b858afd178cf41c8a15dfb..5fafff2591c6442ecc26f66d62a716ebaa844634 100644 (file)
--- a/src/internal/goexperiment/exp_staticlockranking_off.go
+++ b/src/internal/goexperiment/exp_staticlockranking_off.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build !goexperiment.staticlockranking
-// +build !goexperiment.staticlockranking
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/exp_staticlockranking_on.go b/src/internal/goexperiment/exp_staticlockranking_on.go
index 78188fb810ca7931c4088979f95cf0fba3052182..dfd32a8ad9cb64a741f8215d91cfd13b78961d65 100644 (file)
--- a/src/internal/goexperiment/exp_staticlockranking_on.go
+++ b/src/internal/goexperiment/exp_staticlockranking_on.go
@@ -1,7 +1,6 @@
 // Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build goexperiment.staticlockranking
-// +build goexperiment.staticlockranking
 
 package goexperiment
 

diff --git a/src/internal/goexperiment/mkconsts.go b/src/internal/goexperiment/mkconsts.go
index 204ca9d9aa4900d003ba97938dce192635eb8796..65c100fa3a6563a8552121370989071a4f47dd56 100644 (file)
--- a/src/internal/goexperiment/mkconsts.go
+++ b/src/internal/goexperiment/mkconsts.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 // mkconsts generates const definition files for each GOEXPERIMENT.
 package main
@@ -52,13 +51,12 @@ func main() {
                        data := fmt.Sprintf(`// Code generated by mkconsts.go. DO NOT EDIT.
 
 //go:build %s%s
-// +build %s%s
 
 package goexperiment
 
 const %s = %v
 const %sInt = %s
-`, pick(val, "!", ""), buildTag, pick(val, "!", ""), buildTag, f, val, f, pick(val, "0", "1"))
+`, pick(val, "!", ""), buildTag, f, val, f, pick(val, "0", "1"))
                        if err := os.WriteFile(name, []byte(data), 0666); err != nil {
                                log.Fatalf("writing %s: %v", name, err)
                        }

diff --git a/src/internal/race/norace.go b/src/internal/race/norace.go
index 67b13057131ead99c9c2d40d026f56bd92db681f..da650489fc4eb89e7c40ac42d24c3159b1229f67 100644 (file)
--- a/src/internal/race/norace.go
+++ b/src/internal/race/norace.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !race
-// +build !race
 
 package race
 

diff --git a/src/internal/race/race.go b/src/internal/race/race.go
index 40f2c99383fa999eb0c6fdd46ec7012e2cc87f7a..d2c7e53e418260feefe18f318f84dff3d9ecfd6b 100644 (file)
--- a/src/internal/race/race.go
+++ b/src/internal/race/race.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build race
-// +build race
 
 package race
 

diff --git a/src/math/big/arith_386.s b/src/math/big/arith_386.s
index 8cf4665f29cd688edee2faf38da005be3d7dc42f..90f6a8c70e1d5381a95408dc9a01b2bcc972ecd3 100644 (file)
--- a/src/math/big/arith_386.s
+++ b/src/math/big/arith_386.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !math_big_pure_go
-// +build !math_big_pure_go
 
 #include "textflag.h"
 

diff --git a/src/math/big/arith_amd64.go b/src/math/big/arith_amd64.go
index 89108fe14926af967a365da4af8bfe3c1b4f4459..3db72582bbc0dde5c9b541900e1791b7a3229b86 100644 (file)
--- a/src/math/big/arith_amd64.go
+++ b/src/math/big/arith_amd64.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !math_big_pure_go
-// +build !math_big_pure_go
 
 package big
 

diff --git a/src/math/big/arith_amd64.s b/src/math/big/arith_amd64.s
index b1e914c2bdc0d73230a57610fbce763302291e2c..a5b65b1d3c75f6b6f7a532469b3b4c52b78df47c 100644 (file)
--- a/src/math/big/arith_amd64.s
+++ b/src/math/big/arith_amd64.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !math_big_pure_go
-// +build !math_big_pure_go
 
 #include "textflag.h"
 

diff --git a/src/math/big/arith_arm.s b/src/math/big/arith_arm.s
index 10054bde474327605f9f8ffef77dc194d626bfb3..ece3a96f51246b066b165d7b2ed69261642076da 100644 (file)
--- a/src/math/big/arith_arm.s
+++ b/src/math/big/arith_arm.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !math_big_pure_go
-// +build !math_big_pure_go
 
 #include "textflag.h"
 

diff --git a/src/math/big/arith_arm64.s b/src/math/big/arith_arm64.s
index addf2d64a1886af35d511e75a867981c4092203e..204006e01dcfe393fe7c775a243d9c47d6b0ee72 100644 (file)
--- a/src/math/big/arith_arm64.s
+++ b/src/math/big/arith_arm64.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !math_big_pure_go
-// +build !math_big_pure_go
 
 #include "textflag.h"
 

diff --git a/src/math/big/arith_decl.go b/src/math/big/arith_decl.go
index 9b254f22130fcafd769ed197bec5d1cd2678ba38..f14f8d6794ee0a22c26d01326f4221d44fd1d11c 100644 (file)
--- a/src/math/big/arith_decl.go
+++ b/src/math/big/arith_decl.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !math_big_pure_go
-// +build !math_big_pure_go
 
 package big
 

diff --git a/src/math/big/arith_decl_pure.go b/src/math/big/arith_decl_pure.go
index 75f3ed29486ee7b473529db250e24549d8f5d802..4d7bbc8771633148d11e7a249342dacda92cb0a1 100644 (file)
--- a/src/math/big/arith_decl_pure.go
+++ b/src/math/big/arith_decl_pure.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build math_big_pure_go
-// +build math_big_pure_go
 
 package big
 

diff --git a/src/math/big/arith_decl_s390x.go b/src/math/big/arith_decl_s390x.go
index 4193f3231cb32439c9b938fd1163fb068e7648db..653916687812bf98aadb01f8b37c447bad4d19c9 100644 (file)
--- a/src/math/big/arith_decl_s390x.go
+++ b/src/math/big/arith_decl_s390x.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !math_big_pure_go
-// +build !math_big_pure_go
 
 package big
 

diff --git a/src/math/big/arith_loong64.s b/src/math/big/arith_loong64.s
index 0ae30319672823fe73779a6aa856d9cf9d7fd3a1..847e3127fbf41036dd1aab570b5d17bcc1817496 100644 (file)
--- a/src/math/big/arith_loong64.s
+++ b/src/math/big/arith_loong64.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 !math_big_pure_go,loong64
+//go:build !math_big_pure_go && loong64
 
 #include "textflag.h"
 

diff --git a/src/math/big/arith_mips64x.s b/src/math/big/arith_mips64x.s
index 3ee6e27c82310066234212b07ae0c3b234c06caf..393a3efb9bcef2ce57fa3c70066ba1d6fd3a0d58 100644 (file)
--- a/src/math/big/arith_mips64x.s
+++ b/src/math/big/arith_mips64x.s
@@ -3,8 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !math_big_pure_go && (mips64 || mips64le)
-// +build !math_big_pure_go
-// +build mips64 mips64le
 
 #include "textflag.h"
 

diff --git a/src/math/big/arith_mipsx.s b/src/math/big/arith_mipsx.s
index b1d32821afd40d89c6e384108747b6073a78cacb..cdb4bbcab63336efe34709ab3c3cfe109791e541 100644 (file)
--- a/src/math/big/arith_mipsx.s
+++ b/src/math/big/arith_mipsx.s
@@ -3,8 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !math_big_pure_go && (mips || mipsle)
-// +build !math_big_pure_go
-// +build mips mipsle
 
 #include "textflag.h"
 

diff --git a/src/math/big/arith_ppc64x.s b/src/math/big/arith_ppc64x.s
index 0613f5c3ad0b7d0462ac2d95cc32f211ba1b1549..9512a12270d42386db75bcca97e21741cec40f9b 100644 (file)
--- a/src/math/big/arith_ppc64x.s
+++ b/src/math/big/arith_ppc64x.s
@@ -3,8 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !math_big_pure_go && (ppc64 || ppc64le)
-// +build !math_big_pure_go
-// +build ppc64 ppc64le
 
 #include "textflag.h"
 

diff --git a/src/math/big/arith_riscv64.s b/src/math/big/arith_riscv64.s
index cb9ac182927b6e9ca6b1f805f085dfc7de4ed97a..bad32497b71c6739e7013199e2368355b8dc8686 100644 (file)
--- a/src/math/big/arith_riscv64.s
+++ b/src/math/big/arith_riscv64.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !math_big_pure_go && riscv64
-// +build !math_big_pure_go,riscv64
 
 #include "textflag.h"
 

diff --git a/src/math/big/arith_s390x.s b/src/math/big/arith_s390x.s
index aa6590e20a53da0d2829d72ca4edca3470f71700..01a7bb2d51262962bc3c6d6deb991b205c0a7b21 100644 (file)
--- a/src/math/big/arith_s390x.s
+++ b/src/math/big/arith_s390x.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !math_big_pure_go
-// +build !math_big_pure_go
 
 #include "textflag.h"
 

diff --git a/src/math/big/arith_s390x_test.go b/src/math/big/arith_s390x_test.go
index 093984b397e88f3a0ed629ec01bbf872cd015fde..0b91cc1393fb285a792969b18b72f6bbb1377dad 100644 (file)
--- a/src/math/big/arith_s390x_test.go
+++ b/src/math/big/arith_s390x_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build s390x && !math_big_pure_go
-// +build s390x,!math_big_pure_go
 
 package big
 

diff --git a/src/math/big/arith_wasm.s b/src/math/big/arith_wasm.s
index 93eb16d21d8c7e54ff8d94cec7bb8bbf8c45b4a6..fd51031d8a02461f46e30378c5778e95c71c9b36 100644 (file)
--- a/src/math/big/arith_wasm.s
+++ b/src/math/big/arith_wasm.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !math_big_pure_go
-// +build !math_big_pure_go
 
 #include "textflag.h"
 

diff --git a/src/math/bits/bits_errors.go b/src/math/bits/bits_errors.go
index 61cb5c945707610c618b055c1852679b7d48cec5..353d2f6ad3a27d6610993506e42389e9ea2e79de 100644 (file)
--- a/src/math/bits/bits_errors.go
+++ b/src/math/bits/bits_errors.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !compiler_bootstrap
-// +build !compiler_bootstrap
 
 package bits
 

diff --git a/src/math/bits/bits_errors_bootstrap.go b/src/math/bits/bits_errors_bootstrap.go
index 4d610d33b8bb399a123540cc8a30293ace326732..6b14e41f83c4d86010812e171f540867d684437d 100644 (file)
--- a/src/math/bits/bits_errors_bootstrap.go
+++ b/src/math/bits/bits_errors_bootstrap.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build compiler_bootstrap
-// +build compiler_bootstrap
 
 // This version used only for bootstrap (on this path we want
 // to avoid use of go:linkname as applied to variables).

diff --git a/src/math/bits/make_examples.go b/src/math/bits/make_examples.go
index 92e9aabfb52738ebc1af7f5526c893b873b14e65..4bd7f581479d360e99e8788ebfec2074a3195d8c 100644 (file)
--- a/src/math/bits/make_examples.go
+++ b/src/math/bits/make_examples.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 // This program generates example_test.go.
 

diff --git a/src/math/bits/make_tables.go b/src/math/bits/make_tables.go
index 867025ea61dfe59303c32bea50e3abb64f1c1928..d067361a12358226ae654b468a8bed1e4a290cac 100644 (file)
--- a/src/math/bits/make_tables.go
+++ b/src/math/bits/make_tables.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 // This program generates bits_tables.go.
 

diff --git a/src/math/floor_ppc64x.s b/src/math/floor_ppc64x.s
index 584c27e28f684bb439a1d91eb7cee9c5891eff51..e9c5d49f4a5aaf6dfd2a438ad2ec98acc8e5cfc9 100644 (file)
--- a/src/math/floor_ppc64x.s
+++ b/src/math/floor_ppc64x.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ppc64 || ppc64le
-// +build ppc64 ppc64le
 
 #include "textflag.h"
 

diff --git a/src/math/modf_ppc64x.s b/src/math/modf_ppc64x.s
index 1303067661c351c37cf4a532fb2035baec05a038..410b523c0e815ca96aaf159f77969b288de89886 100644 (file)
--- a/src/math/modf_ppc64x.s
+++ b/src/math/modf_ppc64x.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ppc64 || ppc64le
-// +build ppc64 ppc64le
 
 #include "textflag.h"
 

diff --git a/src/net/http/h2_error.go b/src/net/http/h2_error.go
index 0391d31e5b428f7a3d9e083fffc3ad5ed7ce0f02..2c0b21ec070019ea36bc02a7ecf3df4aaf03d03a 100644 (file)
--- a/src/net/http/h2_error.go
+++ b/src/net/http/h2_error.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !nethttpomithttp2
-// +build !nethttpomithttp2
 
 package http
 

diff --git a/src/net/http/h2_error_test.go b/src/net/http/h2_error_test.go
index 0d85e2f36c3faf0693ec52935eab2246adef55e3..5e400683b415e7e47f501d8d845ca513caefe3b6 100644 (file)
--- a/src/net/http/h2_error_test.go
+++ b/src/net/http/h2_error_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !nethttpomithttp2
-// +build !nethttpomithttp2
 
 package http
 

diff --git a/src/net/sendfile_linux_test.go b/src/net/sendfile_linux_test.go
index 8cd6acca17ced4e08b1a4a5665d5e89378de3a30..0b5af36cdb7933dd3fa16c3507a5f0ccc5e70cd6 100644 (file)
--- a/src/net/sendfile_linux_test.go
+++ b/src/net/sendfile_linux_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux
-// +build linux
 
 package net
 

diff --git a/src/runtime/internal/atomic/atomic_andor_test.go b/src/runtime/internal/atomic/atomic_andor_test.go
index a1918e3ecfa944e7d713accbd819935119bdb481..03c2c754f33d48c2053decffbe30eade2a48d1ea 100644 (file)
--- a/src/runtime/internal/atomic/atomic_andor_test.go
+++ b/src/runtime/internal/atomic/atomic_andor_test.go
@@ -1,5 +1,4 @@
 //go:build wasm || ppc64 || ppc64le
-// +build wasm ppc64 ppc64le
 
 //
 // Copyright 2023 The Go Authors. All rights reserved.

diff --git a/src/runtime/race_s390x.s b/src/runtime/race_s390x.s
index beb7f830f22af18e87017ab38bb42bd0406b97bf..dadc12f4dbfba5a28c5fac8b731dc8d7f1cf0ac3 100644 (file)
--- a/src/runtime/race_s390x.s
+++ b/src/runtime/race_s390x.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build race
-// +build race
 
 #include "go_asm.h"
 #include "funcdata.h"

diff --git a/src/runtime/vdso_linux_s390x.go b/src/runtime/vdso_linux_s390x.go
index c1c0b1baa47c7ddab6d667e338d1340b74266384..970ecd3ce630768d75e16ab9e4e651bc85e0ae3e 100644 (file)
--- a/src/runtime/vdso_linux_s390x.go
+++ b/src/runtime/vdso_linux_s390x.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && s390x
-// +build linux,s390x
 
 package runtime
 

diff --git a/src/sort/gen_sort_variants.go b/src/sort/gen_sort_variants.go
index 89500e1c10fd704541e04978257c313680e36dcb..95fca7098789a30dccc37f017363cd8894145f73 100644 (file)
--- a/src/sort/gen_sort_variants.go
+++ b/src/sort/gen_sort_variants.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 // This program is run via "go generate" (via a directive in sort.go)
 // to generate implementation variants of the underlying sorting algorithm.

diff --git a/src/strconv/bytealg.go b/src/strconv/bytealg.go
index a2bb12c5f219fed757cf22048b22a5ac0a329904..6fe1624c0e777bbabfa7a244d4ad6d1b8a9e09a1 100644 (file)
--- a/src/strconv/bytealg.go
+++ b/src/strconv/bytealg.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !compiler_bootstrap
-// +build !compiler_bootstrap
 
 package strconv
 

diff --git a/src/strconv/bytealg_bootstrap.go b/src/strconv/bytealg_bootstrap.go
index 0ed79f4de7abc53d2027f9f32ea23710ba2e4b8e..12d96e5b531f73ee756ceacafc61bcb6868941fd 100644 (file)
--- a/src/strconv/bytealg_bootstrap.go
+++ b/src/strconv/bytealg_bootstrap.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build compiler_bootstrap
-// +build compiler_bootstrap
 
 package strconv
 

diff --git a/src/strconv/makeisprint.go b/src/strconv/makeisprint.go
index 909f9e47878b58f17362aea6f6646758e9f974fe..ff361e7b41fb3c0abe0be10a1cbba40afe087fb1 100644 (file)
--- a/src/strconv/makeisprint.go
+++ b/src/strconv/makeisprint.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
-// +build ignore
 
 //
 // usage: