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>

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"
 

src/crypto/md5/md5block_ppc64x.s

@@ -11,7 +11,6 @@
 // in the public domain.
 
 //go:build ppc64 || ppc64le
-// +build ppc64 ppc64le
 
 #include "textflag.h"
 

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"
 

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"
 

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
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"
 

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"
 

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"
 

src/runtime/duff_mips64x.s

@@ -3,7 +3,6 @@
 // See mkduff.go for comments.
 
 //go:build mips64 || mips64le
-// +build mips64 mips64le
 
 #include "textflag.h"
 

src/runtime/duff_ppc64x.s

@@ -3,7 +3,6 @@
 // See mkduff.go for comments.
 
 //go:build ppc64 || ppc64le
-// +build ppc64 ppc64le
 
 #include "textflag.h"
 

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"
 

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"
 

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"
 

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"
 

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"

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"

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"

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"

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"

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"
 

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"
 

src/runtime/memmove_386.s

@@ -24,7 +24,6 @@
 // THE SOFTWARE.
 
 //go:build !plan9
-// +build !plan9
 
 #include "go_asm.h"
 #include "textflag.h"

src/runtime/memmove_amd64.s

@@ -24,7 +24,6 @@
 // THE SOFTWARE.
 
 //go:build !plan9
-// +build !plan9
 
 #include "go_asm.h"
 #include "textflag.h"

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"
 

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"
 

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"
 

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

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

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

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"

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"

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"

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"

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"

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"

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"

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"

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"

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

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"
 

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

src/syscall/asan.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build asan
-// +build asan
 
 package syscall
 

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
 

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"

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"
 

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"

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"
 

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"
 

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"

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"

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
 

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