Skip to content

Commit

Permalink
all: remove more leftover // +build lines
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
tklauser committed Nov 6, 2021
1 parent b74f2ef commit f19e400
Show file tree
Hide file tree
Showing 83 changed files with 1 addition and 94 deletions.
1 change: 0 additions & 1 deletion src/crypto/cipher/xor_ppc64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.

//go:build ppc64 || ppc64le
// +build ppc64 ppc64le

#include "textflag.h"

Expand Down
1 change: 0 additions & 1 deletion src/crypto/md5/md5block_ppc64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
// in the public domain.

//go:build ppc64 || ppc64le
// +build ppc64 ppc64le

#include "textflag.h"

Expand Down
1 change: 0 additions & 1 deletion src/crypto/x509/internal/macos/corefoundation.s
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.

//go:build darwin && !ios
// +build darwin,!ios

#include "textflag.h"

Expand Down
1 change: 0 additions & 1 deletion src/crypto/x509/internal/macos/security.s
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.

//go:build darwin && !ios
// +build darwin,!ios

#include "textflag.h"

Expand Down
1 change: 0 additions & 1 deletion src/debug/pe/file_cgo_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.

//go:build cgo
// +build cgo

package pe

Expand Down
1 change: 0 additions & 1 deletion src/internal/bytealg/compare_mips64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/internal/bytealg/compare_mipsx.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/internal/bytealg/compare_ppc64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/internal/bytealg/count_ppc64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/internal/bytealg/equal_mips64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/internal/bytealg/equal_mipsx.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/internal/bytealg/equal_ppc64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/internal/bytealg/index_ppc64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
// implementation on power9.

//go:build ppc64 || ppc64le
// +build ppc64 ppc64le

#include "go_asm.h"
#include "textflag.h"
Expand Down
1 change: 0 additions & 1 deletion src/internal/bytealg/indexbyte_mips64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/internal/bytealg/indexbyte_mipsx.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/internal/bytealg/indexbyte_ppc64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/internal/cpu/cpu_x86.s
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.

//go:build 386 || amd64
// +build 386 amd64

#include "textflag.h"

Expand Down
1 change: 0 additions & 1 deletion src/reflect/asm_mips64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/reflect/asm_mipsx.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/reflect/asm_ppc64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/reflect/float32reg_ppc64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.

//go:build ppc64 || ppc64le
// +build ppc64 ppc64le

#include "textflag.h"

Expand Down
1 change: 0 additions & 1 deletion src/runtime/asan_amd64.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/runtime/asan_arm64.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/runtime/asm_mips64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/runtime/asm_mipsx.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/runtime/asm_ppc64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/runtime/atomic_mips64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.

//go:build mips64 || mips64le
// +build mips64 mips64le

#include "textflag.h"

Expand Down
1 change: 0 additions & 1 deletion src/runtime/atomic_mipsx.s
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.

//go:build mips || mipsle
// +build mips mipsle

#include "textflag.h"

Expand Down
1 change: 0 additions & 1 deletion src/runtime/atomic_ppc64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.

//go:build ppc64 || ppc64le
// +build ppc64 ppc64le

#include "textflag.h"

Expand Down
1 change: 0 additions & 1 deletion src/runtime/duff_mips64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// See mkduff.go for comments.

//go:build mips64 || mips64le
// +build mips64 mips64le

#include "textflag.h"

Expand Down
1 change: 0 additions & 1 deletion src/runtime/duff_ppc64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// See mkduff.go for comments.

//go:build ppc64 || ppc64le
// +build ppc64 ppc64le

#include "textflag.h"

Expand Down
1 change: 0 additions & 1 deletion src/runtime/internal/atomic/atomic_mips64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.

//go:build mips64 || mips64le
// +build mips64 mips64le

#include "textflag.h"

Expand Down
1 change: 0 additions & 1 deletion src/runtime/internal/atomic/atomic_mipsx.s
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.

//go:build mips || mipsle
// +build mips mipsle

#include "textflag.h"

Expand Down
1 change: 0 additions & 1 deletion src/runtime/internal/atomic/atomic_ppc64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.

//go:build ppc64 || ppc64le
// +build ppc64 ppc64le

#include "textflag.h"

Expand Down
1 change: 0 additions & 1 deletion src/runtime/internal/atomic/sys_nonlinux_arm.s
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.

//go:build !linux
// +build !linux

#include "textflag.h"

Expand Down
1 change: 0 additions & 1 deletion src/runtime/libfuzzer_amd64.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/runtime/libfuzzer_arm64.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/runtime/memclr_386.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/runtime/memclr_amd64.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/runtime/memclr_mips64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/runtime/memclr_mipsx.s
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.

//go:build mips || mipsle
// +build mips mipsle

#include "textflag.h"

Expand Down
1 change: 0 additions & 1 deletion src/runtime/memclr_ppc64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.

//go:build ppc64 || ppc64le
// +build ppc64 ppc64le

#include "textflag.h"

Expand Down
1 change: 0 additions & 1 deletion src/runtime/memmove_386.s
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
// THE SOFTWARE.

//go:build !plan9
// +build !plan9

#include "go_asm.h"
#include "textflag.h"
Expand Down
1 change: 0 additions & 1 deletion src/runtime/memmove_amd64.s
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
// THE SOFTWARE.

//go:build !plan9
// +build !plan9

#include "go_asm.h"
#include "textflag.h"
Expand Down
1 change: 0 additions & 1 deletion src/runtime/memmove_mips64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.

//go:build mips64 || mips64le
// +build mips64 mips64le

#include "textflag.h"

Expand Down
1 change: 0 additions & 1 deletion src/runtime/memmove_mipsx.s
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.

//go:build mips || mipsle
// +build mips mipsle

#include "textflag.h"

Expand Down
1 change: 0 additions & 1 deletion src/runtime/memmove_ppc64x.s
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// license that can be found in the LICENSE file.

//go:build ppc64 || ppc64le
// +build ppc64 ppc64le

#include "textflag.h"

Expand Down
1 change: 0 additions & 1 deletion src/runtime/msan_amd64.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/runtime/msan_arm64.s
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/runtime/preempt_mips64x.s
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Loading

0 comments on commit f19e400

Please sign in to comment.