all: remove more leftover // +build lines

CL 344955 and CL 359476 removed almost all // +build lines, but leaving
some assembly files and generating scripts. Also, some files were added
with // +build lines after CL 359476 was merged. Remove these or rename
files where more appropriate.

For #41184

Change-Id: I7eb85a498ed9788b42a636e775f261d755504ffa
Reviewed-on: https://go-review.googlesource.com/c/go/+/361480
Trust: Tobias Klauser <tobias.klauser@gmail.com>
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>

diff --git a/src/crypto/cipher/xor_ppc64x.s b/src/crypto/cipher/xor_ppc64x.s
index 2ba6d9639c46c96d6d0acb2dd5ef3f37f20db30d..a2ec95c0be01ef1552978416ef998dcdaacee57f 100644 (file)
--- a/src/crypto/cipher/xor_ppc64x.s
+++ b/src/crypto/cipher/xor_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/crypto/md5/md5block_ppc64x.s b/src/crypto/md5/md5block_ppc64x.s
index 8c28ec2473ca024f8793e73ff9e324d7c9ff8816..69a20e7cad3399abf864bf13dcaf976897657ab0 100644 (file)
--- a/src/crypto/md5/md5block_ppc64x.s
+++ b/src/crypto/md5/md5block_ppc64x.s
@@ -11,7 +11,6 @@
 // in the public domain.
 
 //go:build ppc64 || ppc64le
-// +build ppc64 ppc64le
 
 #include "textflag.h"
 

diff --git a/src/crypto/x509/internal/macos/corefoundation.s b/src/crypto/x509/internal/macos/corefoundation.s
index 376099caa3438cbc75b4b52fdc5d7c07ba580cd7..e60bd8712dbf1e5d777b9f674949d4c6c4f877d9 100644 (file)
--- a/src/crypto/x509/internal/macos/corefoundation.s
+++ b/src/crypto/x509/internal/macos/corefoundation.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin && !ios
-// +build darwin,!ios
 
 #include "textflag.h"
 

diff --git a/src/crypto/x509/internal/macos/security.s b/src/crypto/x509/internal/macos/security.s
index 9c1c1334898e0f2211d7511b41420ebab1a70552..77406a0553a26ae915b6c20aebb71eddd375d97d 100644 (file)
--- a/src/crypto/x509/internal/macos/security.s
+++ b/src/crypto/x509/internal/macos/security.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin && !ios
-// +build darwin,!ios
 
 #include "textflag.h"
 

diff --git a/src/debug/pe/file_cgo_test.go b/src/debug/pe/file_cgo_test.go
index 13eb4e62b2ed7687eacd4d0c25be3766b028be80..9280de1a4977c5d6f089c654e9d5ebf49a1d68e8 100644 (file)
--- a/src/debug/pe/file_cgo_test.go
+++ b/src/debug/pe/file_cgo_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build cgo
-// +build cgo
 
 package pe
 

diff --git a/src/internal/bytealg/compare_mips64x.s b/src/internal/bytealg/compare_mips64x.s
index b472e510bce7a5872a210da038e7a820186f21e5..117a9ef631fd2b572eff3408fd8d27f0bacc98b9 100644 (file)
--- a/src/internal/bytealg/compare_mips64x.s
+++ b/src/internal/bytealg/compare_mips64x.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build mips64 || mips64le
-// +build mips64 mips64le
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/internal/bytealg/compare_mipsx.s b/src/internal/bytealg/compare_mipsx.s
index dcc4916e567141bcd18cb07c3832f8cfa060a79f..857ac1338906f4bec64eb7b83242eb794d41ccbc 100644 (file)
--- a/src/internal/bytealg/compare_mipsx.s
+++ b/src/internal/bytealg/compare_mipsx.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build mips || mipsle
-// +build mips mipsle
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/internal/bytealg/compare_ppc64x.s b/src/internal/bytealg/compare_ppc64x.s
index 390a72688b73bec52efb9510da69c3ab8583aa3c..2793e44e8be87204c92a6564942d62141aa4a54d 100644 (file)
--- a/src/internal/bytealg/compare_ppc64x.s
+++ b/src/internal/bytealg/compare_ppc64x.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ppc64 || ppc64le
-// +build ppc64 ppc64le
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/internal/bytealg/count_ppc64x.s b/src/internal/bytealg/count_ppc64x.s
index dbafd06edc595c517a78c9b544fd5777e0985871..43d547bb8a7e21c06e01ab99486bddeb4bb9d042 100644 (file)
--- a/src/internal/bytealg/count_ppc64x.s
+++ b/src/internal/bytealg/count_ppc64x.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ppc64le || ppc64
-// +build ppc64le ppc64
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/internal/bytealg/equal_mips64x.s b/src/internal/bytealg/equal_mips64x.s
index c2f7d3997edb36c0d38ad5739c4f5b61455cd3aa..d92f225e8d29d1a87263faeb593683144a8c9d64 100644 (file)
--- a/src/internal/bytealg/equal_mips64x.s
+++ b/src/internal/bytealg/equal_mips64x.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build mips64 || mips64le
-// +build mips64 mips64le
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/internal/bytealg/equal_mipsx.s b/src/internal/bytealg/equal_mipsx.s
index 11e5549e45a1fac488a6c8e65164cf8cb0887edf..4c46dd4fce42d0d8b595826095c5e873930516ca 100644 (file)
--- a/src/internal/bytealg/equal_mipsx.s
+++ b/src/internal/bytealg/equal_mipsx.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build mips || mipsle
-// +build mips mipsle
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/internal/bytealg/equal_ppc64x.s b/src/internal/bytealg/equal_ppc64x.s
index d59154101ac649eb577e5761da31dc7cee252fc2..bd8caa7f1831b7dda5fdbbe00c1857ff22718ebe 100644 (file)
--- a/src/internal/bytealg/equal_ppc64x.s
+++ b/src/internal/bytealg/equal_ppc64x.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ppc64 || ppc64le
-// +build ppc64 ppc64le
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/internal/bytealg/index_ppc64x.s b/src/internal/bytealg/index_ppc64x.s
index ab47495427dbae9ab3fcd44ea49bbf66b93e7114..2d2a7146f175b5497cbf60fa946d73607dc37d5d 100644 (file)
--- a/src/internal/bytealg/index_ppc64x.s
+++ b/src/internal/bytealg/index_ppc64x.s
@@ -22,7 +22,6 @@
 // implementation on power9.
 
 //go:build ppc64 || ppc64le
-// +build ppc64 ppc64le
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/internal/bytealg/indexbyte_mips64x.s b/src/internal/bytealg/indexbyte_mips64x.s
index 0f377f5a4c9e330d936d18dbd7efc501fe08197e..5689f84b47a54a580fa878501e0fcbdbabc2057b 100644 (file)
--- a/src/internal/bytealg/indexbyte_mips64x.s
+++ b/src/internal/bytealg/indexbyte_mips64x.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build mips64 || mips64le
-// +build mips64 mips64le
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/internal/bytealg/indexbyte_mipsx.s b/src/internal/bytealg/indexbyte_mipsx.s
index bed015bbd6b5af3d4d54bafcaad3fc06d0b3c1bd..1c2b104d3c9efdbb92b4e01c3269b2823cd76f2d 100644 (file)
--- a/src/internal/bytealg/indexbyte_mipsx.s
+++ b/src/internal/bytealg/indexbyte_mipsx.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build mips || mipsle
-// +build mips mipsle
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/internal/bytealg/indexbyte_ppc64x.s b/src/internal/bytealg/indexbyte_ppc64x.s
index 27e1ad7e0dd07fe48579f0b6c60e4ccfc9e0beb5..87ef8ecffcdec853194e7226aced7a43dfb4af7f 100644 (file)
--- a/src/internal/bytealg/indexbyte_ppc64x.s
+++ b/src/internal/bytealg/indexbyte_ppc64x.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ppc64 || ppc64le
-// +build ppc64 ppc64le
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/internal/cpu/cpu_x86.s b/src/internal/cpu/cpu_x86.s
index 0df5da1cc74d45b42b26940b4e03c8d8e8b7154b..edef21905ca51c7b1a50e170d738295d86fe8cbb 100644 (file)
--- a/src/internal/cpu/cpu_x86.s
+++ b/src/internal/cpu/cpu_x86.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build 386 || amd64
-// +build 386 amd64
 
 #include "textflag.h"
 

diff --git a/src/reflect/asm_mips64x.s b/src/reflect/asm_mips64x.s
index 8d01c5fb7ed737c490a14a50ee81520ba4c8e21c..f21e34df1bc248080e94c77013f6d3edeb3b77a0 100644 (file)
--- a/src/reflect/asm_mips64x.s
+++ b/src/reflect/asm_mips64x.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build mips64 || mips64le
-// +build mips64 mips64le
 
 #include "textflag.h"
 #include "funcdata.h"

diff --git a/src/reflect/asm_mipsx.s b/src/reflect/asm_mipsx.s
index 6ea82331084248bff8f45d6953d625c794be865a..636c8a5c71c3d701940e6d00d7acd7ccea90592e 100644 (file)
--- a/src/reflect/asm_mipsx.s
+++ b/src/reflect/asm_mipsx.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build mips || mipsle
-// +build mips mipsle
 
 #include "textflag.h"
 #include "funcdata.h"

diff --git a/src/reflect/asm_ppc64x.s b/src/reflect/asm_ppc64x.s
index 1ccfb25b94141be9959852943f574696a89a7481..3b529be6853529a960bca62df456b07d77c1fb20 100644 (file)
--- a/src/reflect/asm_ppc64x.s
+++ b/src/reflect/asm_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"
 #include "funcdata.h"

diff --git a/src/reflect/float32reg_ppc64x.s b/src/reflect/float32reg_ppc64x.s
index 391edfa7ce7ddfd76e1b38c7d5f00713f03de285..a4deb18427af0f81441a2e247fe7304facc471b7 100644 (file)
--- a/src/reflect/float32reg_ppc64x.s
+++ b/src/reflect/float32reg_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/runtime/asan_amd64.s b/src/runtime/asan_amd64.s
index 01bd612dc305bcc095352a612f8f4e58d2178ec0..e8de80399b7ca3a90f1e17e6a96030b38f3f2d9d 100644 (file)
--- a/src/runtime/asan_amd64.s
+++ b/src/runtime/asan_amd64.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build asan
-// +build asan
 
 #include "go_asm.h"
 #include "go_tls.h"

diff --git a/src/runtime/asan_arm64.s b/src/runtime/asan_arm64.s
index eb0f9bd71ec162c74d4f00a057fee639b0f3c7d3..acae200fb5ec894a006bf3754d89ce0cad433fd4 100644 (file)
--- a/src/runtime/asan_arm64.s
+++ b/src/runtime/asan_arm64.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build asan
-// +build asan
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/runtime/asm_mips64x.s b/src/runtime/asm_mips64x.s
index e0e5cbb7048c918de43d2696f7d692d707a60329..3597ebec57c74ffad714f5fdc751d55c94032531 100644 (file)
--- a/src/runtime/asm_mips64x.s
+++ b/src/runtime/asm_mips64x.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build mips64 || mips64le
-// +build mips64 mips64le
 
 #include "go_asm.h"
 #include "go_tls.h"

diff --git a/src/runtime/asm_mipsx.s b/src/runtime/asm_mipsx.s
index 1b550719d17eb4b5e3ef5ff320a814783315a960..4a086b8eb302cf167f028351012b052c9ab9b4b8 100644 (file)
--- a/src/runtime/asm_mipsx.s
+++ b/src/runtime/asm_mipsx.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build mips || mipsle
-// +build mips mipsle
 
 #include "go_asm.h"
 #include "go_tls.h"

diff --git a/src/runtime/asm_ppc64x.s b/src/runtime/asm_ppc64x.s
index 0e7ef7b2b8fd7eba0c25fce6de60acc8be87a46e..ae14213999534c9bf490f1cd5e8170d10a34fc46 100644 (file)
--- a/src/runtime/asm_ppc64x.s
+++ b/src/runtime/asm_ppc64x.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ppc64 || ppc64le
-// +build ppc64 ppc64le
 
 #include "go_asm.h"
 #include "go_tls.h"

diff --git a/src/runtime/atomic_mips64x.s b/src/runtime/atomic_mips64x.s
index e2118e6a20b2538cbd0f0740316533837a8bed05..dd6380ce409e51e4b7076e060a0dd244a1ea70de 100644 (file)
--- a/src/runtime/atomic_mips64x.s
+++ b/src/runtime/atomic_mips64x.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build mips64 || mips64le
-// +build mips64 mips64le
 
 #include "textflag.h"
 

diff --git a/src/runtime/atomic_mipsx.s b/src/runtime/atomic_mipsx.s
index 1eacd273b44154e06ff0b9cd19676d4d2e881757..ac255fe7e626382265c4f040c32c62916177d818 100644 (file)
--- a/src/runtime/atomic_mipsx.s
+++ b/src/runtime/atomic_mipsx.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build mips || mipsle
-// +build mips mipsle
 
 #include "textflag.h"
 

diff --git a/src/runtime/atomic_ppc64x.s b/src/runtime/atomic_ppc64x.s
index b63de2dbd311cd8396630938368ab93366f74a18..4742b6cf56789de50d90b5960f16301e06899482 100644 (file)
--- a/src/runtime/atomic_ppc64x.s
+++ b/src/runtime/atomic_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/runtime/duff_mips64x.s b/src/runtime/duff_mips64x.s
index a897d7fd9bf25e073f0eb5fd1bad22c0a7b35917..3a8524c78bfe1ac0265796f22276a79b703b9168 100644 (file)
--- a/src/runtime/duff_mips64x.s
+++ b/src/runtime/duff_mips64x.s
@@ -3,7 +3,6 @@
 // See mkduff.go for comments.
 
 //go:build mips64 || mips64le
-// +build mips64 mips64le
 
 #include "textflag.h"
 

diff --git a/src/runtime/duff_ppc64x.s b/src/runtime/duff_ppc64x.s
index eeecf13df14c1bf0a459e491694c1081a40f651f..a3caaa881728a05d33c2cf64e23fdeea67823e34 100644 (file)
--- a/src/runtime/duff_ppc64x.s
+++ b/src/runtime/duff_ppc64x.s
@@ -3,7 +3,6 @@
 // See mkduff.go for comments.
 
 //go:build ppc64 || ppc64le
-// +build ppc64 ppc64le
 
 #include "textflag.h"
 

diff --git a/src/runtime/internal/atomic/atomic_mips64x.s b/src/runtime/internal/atomic/atomic_mips64x.s
index fedfc4a175cc35c460313c99d0756ae3b89f6677..b4411d87da65b5b68b9e6aa6157b92ec75c3c7fe 100644 (file)
--- a/src/runtime/internal/atomic/atomic_mips64x.s
+++ b/src/runtime/internal/atomic/atomic_mips64x.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build mips64 || mips64le
-// +build mips64 mips64le
 
 #include "textflag.h"
 

diff --git a/src/runtime/internal/atomic/atomic_mipsx.s b/src/runtime/internal/atomic/atomic_mipsx.s
index c0835d66ed886acfbad9d82376c994676490097c..390e9ce7acc386f74c16ead53cfcdf37e4703965 100644 (file)
--- a/src/runtime/internal/atomic/atomic_mipsx.s
+++ b/src/runtime/internal/atomic/atomic_mipsx.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build mips || mipsle
-// +build mips mipsle
 
 #include "textflag.h"
 

diff --git a/src/runtime/internal/atomic/atomic_ppc64x.s b/src/runtime/internal/atomic/atomic_ppc64x.s
index 226b3b62162ca8e1f58197b189c0c01fbf992464..04f0eadd065e6fb28519bb80fd304d95b9445581 100644 (file)
--- a/src/runtime/internal/atomic/atomic_ppc64x.s
+++ b/src/runtime/internal/atomic/atomic_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/runtime/internal/atomic/sys_nonlinux_arm.s b/src/runtime/internal/atomic/sys_nonlinux_arm.s
index 04036ca9702da4ce1d25cb16a8f4dcdb64be398c..b55bf908a260560d758e3d912cf987bbdb0e71b5 100644 (file)
--- a/src/runtime/internal/atomic/sys_nonlinux_arm.s
+++ b/src/runtime/internal/atomic/sys_nonlinux_arm.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !linux
-// +build !linux
 
 #include "textflag.h"
 

diff --git a/src/runtime/libfuzzer_amd64.s b/src/runtime/libfuzzer_amd64.s
index 13645fc7af849ba8f99f148b091a52bc9b49dcfe..253fe15198120c86424a6a4e2bcc3a5f701cf6a1 100644 (file)
--- a/src/runtime/libfuzzer_amd64.s
+++ b/src/runtime/libfuzzer_amd64.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build libfuzzer
-// +build libfuzzer
 
 #include "go_asm.h"
 #include "go_tls.h"

diff --git a/src/runtime/libfuzzer_arm64.s b/src/runtime/libfuzzer_arm64.s
index 4ad8242804eb1179559b7f2670ce3cb23f00193c..ae0efd8c9bf2e8d672cbabd65847e56264ae3ea9 100644 (file)
--- a/src/runtime/libfuzzer_arm64.s
+++ b/src/runtime/libfuzzer_arm64.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build libfuzzer
-// +build libfuzzer
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/runtime/memclr_386.s b/src/runtime/memclr_386.s
index 2627792ced076a308a9410204dbbe51a8f0f8c6d..a72e5f228dbb6bdf0ee56420439bf588c90e7512 100644 (file)
--- a/src/runtime/memclr_386.s
+++ b/src/runtime/memclr_386.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !plan9
-// +build !plan9
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/runtime/memclr_amd64.s b/src/runtime/memclr_amd64.s
index 918a4b9e0e416cedd7808ea541a71a36c0b7dcba..700bbd7b9b0e2d865953fcfd2879eff690f04d3e 100644 (file)
--- a/src/runtime/memclr_amd64.s
+++ b/src/runtime/memclr_amd64.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !plan9
-// +build !plan9
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/runtime/memclr_mips64x.s b/src/runtime/memclr_mips64x.s
index bc037013fe774f504608757c023c14529c9ac330..cf3a9c4ab4fb3696860c153e3eec3b14509c7fe4 100644 (file)
--- a/src/runtime/memclr_mips64x.s
+++ b/src/runtime/memclr_mips64x.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build mips64 || mips64le
-// +build mips64 mips64le
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/runtime/memclr_mipsx.s b/src/runtime/memclr_mipsx.s
index 3d21c3c414c2a0bfbc7abb53971055e20e6d1360..ee3009d46b8b6f521eac35a4ec020d7a1044b8dd 100644 (file)
--- a/src/runtime/memclr_mipsx.s
+++ b/src/runtime/memclr_mipsx.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build mips || mipsle
-// +build mips mipsle
 
 #include "textflag.h"
 

diff --git a/src/runtime/memclr_ppc64x.s b/src/runtime/memclr_ppc64x.s
index 91aa417ca2af76c57f3bedefb70b8f44a11e7172..64132cee96128c9a1319790a93ef2660a4f4b1b4 100644 (file)
--- a/src/runtime/memclr_ppc64x.s
+++ b/src/runtime/memclr_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/runtime/memmove_386.s b/src/runtime/memmove_386.s
index 389ef8847712e0d8adf982b9e20171118233ec73..6d7e17fcbcec879022b2e0e4e9ff02089c3e8408 100644 (file)
--- a/src/runtime/memmove_386.s
+++ b/src/runtime/memmove_386.s
@@ -24,7 +24,6 @@
 // THE SOFTWARE.
 
 //go:build !plan9
-// +build !plan9
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/runtime/memmove_amd64.s b/src/runtime/memmove_amd64.s
index fa0c0e414f48c7e947159d4e68032da8b55fed80..eeb5033fd9556effd46cf6bcce127377ef297e33 100644 (file)
--- a/src/runtime/memmove_amd64.s
+++ b/src/runtime/memmove_amd64.s
@@ -24,7 +24,6 @@
 // THE SOFTWARE.
 
 //go:build !plan9
-// +build !plan9
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/runtime/memmove_mips64x.s b/src/runtime/memmove_mips64x.s
index fef3c6be827f5644057d717f9fc702d22e877a61..b69178ccd38bd4785299cae57922b2d86a16d823 100644 (file)
--- a/src/runtime/memmove_mips64x.s
+++ b/src/runtime/memmove_mips64x.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build mips64 || mips64le
-// +build mips64 mips64le
 
 #include "textflag.h"
 

diff --git a/src/runtime/memmove_mipsx.s b/src/runtime/memmove_mipsx.s
index cd02fc25c4b41aa680a6c430a9597c453348da14..494288cf338cc58a6f7301960c2e24f743f9412e 100644 (file)
--- a/src/runtime/memmove_mipsx.s
+++ b/src/runtime/memmove_mipsx.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build mips || mipsle
-// +build mips mipsle
 
 #include "textflag.h"
 

diff --git a/src/runtime/memmove_ppc64x.s b/src/runtime/memmove_ppc64x.s
index b36b23f8ef3d29c6726e8426f2e096464ffa1cff..e69e71a4a1872427a870ae3eae0fd728c55a9ee2 100644 (file)
--- a/src/runtime/memmove_ppc64x.s
+++ b/src/runtime/memmove_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/runtime/msan_amd64.s b/src/runtime/msan_amd64.s
index 1bb57a3b7e80b8edcb96adf646b20eb22dffa22c..89ed3048d0ed5c281ba13f39bc8d230515aa346e 100644 (file)
--- a/src/runtime/msan_amd64.s
+++ b/src/runtime/msan_amd64.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build msan
-// +build msan
 
 #include "go_asm.h"
 #include "go_tls.h"

diff --git a/src/runtime/msan_arm64.s b/src/runtime/msan_arm64.s
index 93ade8dd8970f88be503a60a9759165a2f9f267a..b9eff34ab606a01a4a5947a71c1f012367554340 100644 (file)
--- a/src/runtime/msan_arm64.s
+++ b/src/runtime/msan_arm64.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build msan
-// +build msan
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/runtime/preempt_mips64x.s b/src/runtime/preempt_mips64x.s
index c1249e382e206d1d002e5b64be5e2cca6a712054..996b592ae06eb06299034fddd2fd4484bd4aa438 100644 (file)
--- a/src/runtime/preempt_mips64x.s
+++ b/src/runtime/preempt_mips64x.s
@@ -1,7 +1,6 @@
 // Code generated by mkpreempt.go; DO NOT EDIT.
 
 //go:build mips64 || mips64le
-// +build mips64 mips64le
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/runtime/preempt_mipsx.s b/src/runtime/preempt_mipsx.s
index 70b79e05b99a23cc5229b2946ca5a58138606526..7b169acd99991bace9acef60140754edac66d3b9 100644 (file)
--- a/src/runtime/preempt_mipsx.s
+++ b/src/runtime/preempt_mipsx.s
@@ -1,7 +1,6 @@
 // Code generated by mkpreempt.go; DO NOT EDIT.
 
 //go:build mips || mipsle
-// +build mips mipsle
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/runtime/preempt_ppc64x.s b/src/runtime/preempt_ppc64x.s
index 7ed4021dde74f7ea46d4a042c0dac03673725f46..2c4d02edfe2abce01a1daccda9bbb9df6af8afe2 100644 (file)
--- a/src/runtime/preempt_ppc64x.s
+++ b/src/runtime/preempt_ppc64x.s
@@ -1,7 +1,6 @@
 // Code generated by mkpreempt.go; DO NOT EDIT.
 
 //go:build ppc64 || ppc64le
-// +build ppc64 ppc64le
 
 #include "go_asm.h"
 #include "textflag.h"

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

diff --git a/src/runtime/race_arm64.s b/src/runtime/race_arm64.s
index 2b2413b6b771ff8785dd81bdd7a62df0b767e2dc..798e23294a0237663aec88a4da08e4c4d2bb2a25 100644 (file)
--- a/src/runtime/race_arm64.s
+++ b/src/runtime/race_arm64.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/race_ppc64le.s b/src/runtime/race_ppc64le.s
index 625c81a255bcc148b397ad4623e1b52ca4bbb073..68cc5c880578296ee996f6d43e7cf64cbb40a69c 100644 (file)
--- a/src/runtime/race_ppc64le.s
+++ b/src/runtime/race_ppc64le.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build race
-// +build race
 
 #include "go_asm.h"
 #include "go_tls.h"

diff --git a/src/runtime/rt0_linux_mips64x.s b/src/runtime/rt0_linux_mips64x.s
index fabd8570b57970f599aef2f7cb2524c8124f0f85..e9328b73263199ddbbc478288e986ee69ee5d6d6 100644 (file)
--- a/src/runtime/rt0_linux_mips64x.s
+++ b/src/runtime/rt0_linux_mips64x.s
@@ -3,8 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && (mips64 || mips64le)
-// +build linux
-// +build mips64 mips64le
 
 #include "textflag.h"
 

diff --git a/src/runtime/rt0_linux_mipsx.s b/src/runtime/rt0_linux_mipsx.s
index 9f5842b51a28b3145cf1be2dcbc6bb931aaf9499..3cbb7fc37713c7d5c65574364c2a0569df890ee9 100644 (file)
--- a/src/runtime/rt0_linux_mipsx.s
+++ b/src/runtime/rt0_linux_mipsx.s
@@ -3,8 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && (mips || mipsle)
-// +build linux
-// +build mips mipsle
 
 #include "textflag.h"
 

diff --git a/src/runtime/sys_linux_mips64x.s b/src/runtime/sys_linux_mips64x.s
index 08e44d671b8bd675fdb1393a764090dcb51b1dba..0df25979939357b4b464e0aaa44586903ef7be44 100644 (file)
--- a/src/runtime/sys_linux_mips64x.s
+++ b/src/runtime/sys_linux_mips64x.s
@@ -3,8 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && (mips64 || mips64le)
-// +build linux
-// +build mips64 mips64le
 
 //
 // System calls and other sys.stuff for mips64, Linux

diff --git a/src/runtime/sys_linux_mipsx.s b/src/runtime/sys_linux_mipsx.s
index c82843189946416118b9d2129b0b97c9e9fac9b8..2207e9ab98f702fb0a2b43ddf6d2a6d19a1d668d 100644 (file)
--- a/src/runtime/sys_linux_mipsx.s
+++ b/src/runtime/sys_linux_mipsx.s
@@ -3,8 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && (mips || mipsle)
-// +build linux
-// +build mips mipsle
 
 //
 // System calls and other sys.stuff for mips, Linux

diff --git a/src/runtime/sys_linux_ppc64x.s b/src/runtime/sys_linux_ppc64x.s
index 9347afaf19086b4d189375f698b67d3efe8ed5c8..dc3d89fae741c7ff808cf38bc253e2287ef91d4c 100644 (file)
--- a/src/runtime/sys_linux_ppc64x.s
+++ b/src/runtime/sys_linux_ppc64x.s
@@ -3,8 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && (ppc64 || ppc64le)
-// +build linux
-// +build ppc64 ppc64le
 
 //
 // System calls and other sys.stuff for ppc64, Linux

diff --git a/src/runtime/time_linux_amd64.s b/src/runtime/time_linux_amd64.s
index 67cfdd8fdffb8b5530c70a37f2b0e8d7b716fef0..1416d232304f39d1eaf2bbab1158c229b6194d61 100644 (file)
--- a/src/runtime/time_linux_amd64.s
+++ b/src/runtime/time_linux_amd64.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !faketime
-// +build !faketime
 
 #include "go_asm.h"
 #include "go_tls.h"

diff --git a/src/runtime/time_windows_386.s b/src/runtime/time_windows_386.s
index 19ce6910d73b59e9cdc58c3844df3846a995f57d..b8b636ef306bb753c7db7dab5596591ce014bb0e 100644 (file)
--- a/src/runtime/time_windows_386.s
+++ b/src/runtime/time_windows_386.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !faketime
-// +build !faketime
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/runtime/time_windows_amd64.s b/src/runtime/time_windows_amd64.s
index 70f6a008cddcec563802d8fcbf927b2ff959e70a..226f2b5136e020c5c71a5e27634b29d41350b8d9 100644 (file)
--- a/src/runtime/time_windows_amd64.s
+++ b/src/runtime/time_windows_amd64.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !faketime
-// +build !faketime
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/runtime/time_windows_arm.s b/src/runtime/time_windows_arm.s
index 6552d75ff1ce5355bcfb3fab1bacbb2c9fd3cb83..711af88307207355846c5093555f8f20070d65fa 100644 (file)
--- a/src/runtime/time_windows_arm.s
+++ b/src/runtime/time_windows_arm.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !faketime
-// +build !faketime
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/runtime/time_windows_arm64.s b/src/runtime/time_windows_arm64.s
index ef5b84847379fb217cd0f8db136ae7a992827413..e0c7d28e153f72912fdc4221bf533412ef278b29 100644 (file)
--- a/src/runtime/time_windows_arm64.s
+++ b/src/runtime/time_windows_arm64.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !faketime
-// +build !faketime
 
 #include "go_asm.h"
 #include "textflag.h"

diff --git a/src/runtime/tls_arm.s b/src/runtime/tls_arm.s
index 879caac9e16743c227bbcfe5cf06a5538a44ce60..83fd37e6ecb4fa8d74898023e376e4e5b6d68b85 100644 (file)
--- a/src/runtime/tls_arm.s
+++ b/src/runtime/tls_arm.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !windows
-// +build !windows
 
 #include "go_asm.h"
 #include "go_tls.h"

diff --git a/src/runtime/tls_mips64x.s b/src/runtime/tls_mips64x.s
index 779d64ba31ab248a617cefca70db48eb0c8a2a2d..ec2748e5b22f034cb882b1a372795cb4578da425 100644 (file)
--- a/src/runtime/tls_mips64x.s
+++ b/src/runtime/tls_mips64x.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build mips64 || mips64le
-// +build mips64 mips64le
 
 #include "go_asm.h"
 #include "go_tls.h"

diff --git a/src/runtime/tls_mipsx.s b/src/runtime/tls_mipsx.s
index ada8d06a9e743b93d74ade93f7ba5d7171faf64b..acc3eb5a17854d44c1bf061ebc1871e02fa93b8e 100644 (file)
--- a/src/runtime/tls_mipsx.s
+++ b/src/runtime/tls_mipsx.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build mips || mipsle
-// +build mips mipsle
 
 #include "go_asm.h"
 #include "go_tls.h"

diff --git a/src/runtime/tls_ppc64x.s b/src/runtime/tls_ppc64x.s
index 7e935d0eb295919bbcf2dc10137060fc8ae7f2c8..17aec9fc1e3cb5ccd512ad46326659fb24565a8e 100644 (file)
--- a/src/runtime/tls_ppc64x.s
+++ b/src/runtime/tls_ppc64x.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build ppc64 || ppc64le
-// +build ppc64 ppc64le
 
 #include "go_asm.h"
 #include "go_tls.h"

diff --git a/src/runtime/zcallback_windows.s b/src/runtime/zcallback_windows.s
index 561527c90d1c4d3e0e886e190e2a5f4632dd47c6..bd23d71333ba064c60d10e07a02a3550eee7c98d 100644 (file)
--- a/src/runtime/zcallback_windows.s
+++ b/src/runtime/zcallback_windows.s
@@ -1,7 +1,6 @@
 // Code generated by wincallback.go using 'go generate'. DO NOT EDIT.
 
 //go:build 386 || amd64
-// +build 386 amd64
 
 // runtime·callbackasm is called by external code to
 // execute Go implemented callback function. It is not

diff --git a/src/sync/atomic/asm.s b/src/sync/atomic/asm.s
index 7b8c9b9430ef402c4df820b67a08a0aad281efad..2022304665ef91bc98c71f11d6085cb3e32ef801 100644 (file)
--- a/src/sync/atomic/asm.s
+++ b/src/sync/atomic/asm.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !race
-// +build !race
 
 #include "textflag.h"
 

diff --git a/src/sync/atomic/race.s b/src/sync/atomic/race.s
index 0866487cc71a9035eef7bc2958d82bd3e24dfc17..90bd69f32153fd3441175b2b42e81c023fdfe379 100644 (file)
--- a/src/sync/atomic/race.s
+++ b/src/sync/atomic/race.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build race
-// +build race
 
 // This file is here only to allow external functions.
 // The operations are implemented in src/runtime/race_amd64.s

diff --git a/src/syscall/asan.go b/src/syscall/asan.go
index 31991302115bc8558373dd07a8b66cb95f59a62d..eff30781e4d9b879cb4dd027ea4ba7318a7481b8 100644 (file)
--- a/src/syscall/asan.go
+++ b/src/syscall/asan.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build asan
-// +build asan
 
 package syscall
 

diff --git a/src/syscall/asan0.go b/src/syscall/asan0.go
index 7b69f4a64b0418af91362726a0e94cb072e047ef..08bc44dea1c657ca53daf6f9613134fd543c0bd4 100644 (file)
--- a/src/syscall/asan0.go
+++ b/src/syscall/asan0.go
@@ -1,9 +1,8 @@
-// Copyright 2020 The Go Authors. All rights reserved.
+// 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 !asan
-// +build !asan
 
 package syscall
 

diff --git a/src/syscall/asm9_unix2_amd64.s b/src/syscall/asm9_unix2_amd64.s
index 7e5e3c52ad5d88a5f3a3dbb2f2c5ba03713f5060..649bc6024c9a8f6733e2066b3e6c7697c86defc0 100644 (file)
--- a/src/syscall/asm9_unix2_amd64.s
+++ b/src/syscall/asm9_unix2_amd64.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build dragonfly || freebsd
-// +build dragonfly freebsd
 
 #include "textflag.h"
 #include "funcdata.h"

diff --git a/src/syscall/asm_linux_mips64x.s b/src/syscall/asm_linux_mips64x.s
index d18a7b89440648fe5595e9f9e4b59479bb5eb8ae..a75d0f7a2a24b5764d7a8ef070a2a5ec80066bff 100644 (file)
--- a/src/syscall/asm_linux_mips64x.s
+++ b/src/syscall/asm_linux_mips64x.s
@@ -3,8 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && (mips64 || mips64le)
-// +build linux
-// +build mips64 mips64le
 
 #include "textflag.h"
 

diff --git a/src/syscall/asm_linux_mipsx.s b/src/syscall/asm_linux_mipsx.s
index cafa6a35c7bf486485251e5fce8742b2f773e6cc..04f90f6edf7c8d1da7aa7f99ce190cfaa1d91a49 100644 (file)
--- a/src/syscall/asm_linux_mipsx.s
+++ b/src/syscall/asm_linux_mipsx.s
@@ -3,8 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && (mips || mipsle)
-// +build linux
-// +build mips mipsle
 
 #include "textflag.h"
 #include "funcdata.h"

diff --git a/src/syscall/asm_linux_ppc64x.s b/src/syscall/asm_linux_ppc64x.s
index eac7272f1d8f42e2a1fcd69faeedaaeb0e84322b..044a479c00e4883225c18f7161f546498f3d3c09 100644 (file)
--- a/src/syscall/asm_linux_ppc64x.s
+++ b/src/syscall/asm_linux_ppc64x.s
@@ -3,8 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build linux && (ppc64 || ppc64le)
-// +build linux
-// +build ppc64 ppc64le
 
 #include "textflag.h"
 

diff --git a/src/syscall/asm9_unix1_amd64.s b/src/syscall/asm_netbsd_amd64.s
similarity index 96%
rename from src/syscall/asm9_unix1_amd64.s
rename to src/syscall/asm_netbsd_amd64.s
index e4609d075c9918569b363d18c41a0ad67c640885..9e4dd20ad3f663cc26ed9d6a79518894144fc805 100644 (file)
--- a/src/syscall/asm9_unix1_amd64.s
+++ b/src/syscall/asm_netbsd_amd64.s
@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build netbsd
-// +build netbsd
-
 #include "textflag.h"
 #include "funcdata.h"
 

diff --git a/src/syscall/asm_unix_386.s b/src/syscall/asm_unix_386.s
index 9f9b7f362d231c77536a9025b5d983dac94b112d..22700194cbea95dce1464113d745d1e843032950 100644 (file)
--- a/src/syscall/asm_unix_386.s
+++ b/src/syscall/asm_unix_386.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build freebsd || netbsd
-// +build freebsd netbsd
 
 #include "textflag.h"
 #include "funcdata.h"

diff --git a/src/syscall/asm_unix_amd64.s b/src/syscall/asm_unix_amd64.s
index c53e1a42b6471aa06515deb7121bba3c0a9488f6..8ee46b86b57390bea16daff9e6b30728f7335d84 100644 (file)
--- a/src/syscall/asm_unix_amd64.s
+++ b/src/syscall/asm_unix_amd64.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build dragonfly || freebsd || netbsd
-// +build dragonfly freebsd netbsd
 
 #include "textflag.h"
 #include "funcdata.h"

diff --git a/src/syscall/mksyscall.pl b/src/syscall/mksyscall.pl
index 758948bc53fe1364c29b97717964f27d77092ea6..25ab911b7c6a46a958daf60ef76dafd70cb7d628 100755 (executable)
--- a/src/syscall/mksyscall.pl
+++ b/src/syscall/mksyscall.pl
@@ -387,7 +387,6 @@ print <<EOF;
 // Code generated by the command above; DO NOT EDIT.
 
 //go:build $newtags
-// +build $tags
 
 package syscall
 

diff --git a/src/syscall/mksyscall_libc.pl b/src/syscall/mksyscall_libc.pl
index 631a07c819cbab63ff676258e5839df4830f537d..37314765d8c92cd6ab146e942c937ae01f266e35 100755 (executable)
--- a/src/syscall/mksyscall_libc.pl
+++ b/src/syscall/mksyscall_libc.pl
@@ -309,7 +309,6 @@ print <<EOF;
 // Code generated by the command above; DO NOT EDIT.
 
 //go:build $newtags
-// +build $tags
 
 package $package