Skip to content

Commit 6616573

Browse files
tklausergopherbot
authored andcommitted
cmd/cgo, cmd/compile, cmd/link: remove old style build tags
The minimum bootstrap version for Go ≥ 1.20 is Go 1.17. That version supports the new style //go:build lines. Thus the old style //+build lines can be dropped in this part of the tree as well. Leave the //+build lines in cmd/dist which will ensure the minimum Go version during bootstrap. As suggested by Cherry during review of CL 430496 For #44505 Change-Id: If53c0b02cacbfb055a33e73cfd38578dfd3aa340 Reviewed-on: https://go-review.googlesource.com/c/go/+/436915 TryBot-Result: Gopher Robot <gobot@golang.org> Reviewed-by: Cherry Mui <cherryyz@google.com> Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com> Auto-Submit: Tobias Klauser <tobias.klauser@gmail.com> Reviewed-by: Than McIntosh <thanm@google.com>
1 parent d7dbe01 commit 6616573

33 files changed

+0
-53
lines changed

src/cmd/cgo/ast_go1.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build compiler_bootstrap
6-
// +build compiler_bootstrap
76

87
package main
98

src/cmd/cgo/ast_go118.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build !compiler_bootstrap
6-
// +build !compiler_bootstrap
76

87
package main
98

src/cmd/compile/internal/base/bootstrap_false.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build !compiler_bootstrap
6-
// +build !compiler_bootstrap
76

87
package base
98

src/cmd/compile/internal/base/bootstrap_true.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build compiler_bootstrap
6-
// +build compiler_bootstrap
76

87
package base
98

src/cmd/compile/internal/base/mapfile_mmap.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || (solaris && go1.20)
6-
// +build darwin dragonfly freebsd linux netbsd openbsd solaris,go1.20
76

87
package base
98

src/cmd/compile/internal/base/mapfile_read.go

-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !(solaris && go1.20)
6-
// +build !darwin
7-
// +build !dragonfly
8-
// +build !freebsd
9-
// +build !linux
10-
// +build !netbsd
11-
// +build !openbsd
12-
// +build !solaris !go1.20
136

147
package base
158

src/cmd/compile/internal/ir/mknode.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build ignore
6-
// +build ignore
76

87
// Note: this program must be run in this directory.
98
// go run mknode.go

src/cmd/compile/internal/ssa/flags_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build amd64 || arm64
6-
// +build amd64 arm64
76

87
package ssa
98

src/cmd/compile/internal/ssa/gen/386Ops.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build ignore
6-
// +build ignore
76

87
package main
98

src/cmd/compile/internal/ssa/gen/AMD64Ops.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build ignore
6-
// +build ignore
76

87
package main
98

src/cmd/compile/internal/ssa/gen/ARM64Ops.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build ignore
6-
// +build ignore
76

87
package main
98

src/cmd/compile/internal/ssa/gen/ARMOps.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build ignore
6-
// +build ignore
76

87
package main
98

src/cmd/compile/internal/ssa/gen/LOONG64Ops.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build ignore
6-
// +build ignore
76

87
package main
98

src/cmd/compile/internal/ssa/gen/MIPS64Ops.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build ignore
6-
// +build ignore
76

87
package main
98

src/cmd/compile/internal/ssa/gen/MIPSOps.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build ignore
6-
// +build ignore
76

87
package main
98

src/cmd/compile/internal/ssa/gen/PPC64Ops.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build ignore
6-
// +build ignore
76

87
package main
98

src/cmd/compile/internal/ssa/gen/RISCV64Ops.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build ignore
6-
// +build ignore
76

87
package main
98

src/cmd/compile/internal/ssa/gen/S390XOps.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build ignore
6-
// +build ignore
76

87
package main
98

src/cmd/compile/internal/ssa/gen/WasmOps.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build ignore
6-
// +build ignore
76

87
package main
98

src/cmd/compile/internal/ssa/gen/dec64Ops.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build ignore
6-
// +build ignore
76

87
package main
98

src/cmd/compile/internal/ssa/gen/decOps.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build ignore
6-
// +build ignore
76

87
package main
98

src/cmd/compile/internal/ssa/gen/genericOps.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build ignore
6-
// +build ignore
76

87
package main
98

src/cmd/compile/internal/ssa/gen/main.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build ignore
6-
// +build ignore
76

87
// The gen command generates Go code (in the parent directory) for all
98
// the architecture-specific opcodes, blocks, and rewrites.

src/cmd/compile/internal/ssa/gen/rulegen.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build gen
6-
// +build gen
76

87
// This program generates Go code that applies rewrite rules to a Value.
98
// The generated code implements a function of type func (v *Value) bool

src/cmd/compile/internal/typecheck/builtin/runtime.go

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
// to avoid depending on having a working compiler binary.
88

99
//go:build ignore
10-
// +build ignore
1110

1211
package runtime
1312

src/cmd/compile/internal/typecheck/mkbuiltin.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build ignore
6-
// +build ignore
76

87
// Generate builtin.go from builtin/runtime.go.
98

src/cmd/compile/internal/types2/example_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
// access to compiled packages for import.
77
//
88
//go:build !arm && !arm64
9-
// +build !arm,!arm64
109

1110
package types2_test
1211

src/cmd/internal/bio/buf_mmap.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || (solaris && go1.20)
6-
// +build darwin dragonfly freebsd linux netbsd openbsd solaris,go1.20
76

87
package bio
98

src/cmd/internal/bio/buf_nommap.go

-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !(solaris && go1.20)
6-
// +build !darwin
7-
// +build !dragonfly
8-
// +build !freebsd
9-
// +build !linux
10-
// +build !netbsd
11-
// +build !openbsd
12-
// +build !solaris !go1.20
136

147
package bio
158

src/cmd/link/elf_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build dragonfly || freebsd || linux || netbsd || openbsd
6-
// +build dragonfly freebsd linux netbsd openbsd
76

87
package main
98

src/cmd/link/internal/ld/outbuf_mmap.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || (solaris && go1.20)
6-
// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris,go1.20
76

87
package ld
98

src/cmd/link/internal/ld/outbuf_nofallocate.go

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build !darwin && !linux
6-
// +build !darwin,!linux
76

87
package ld
98

src/cmd/link/internal/ld/outbuf_nommap.go

-9
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,6 @@
33
// license that can be found in the LICENSE file.
44

55
//go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !(solaris && go1.20) && !windows
6-
// +build !aix
7-
// +build !darwin
8-
// +build !dragonfly
9-
// +build !freebsd
10-
// +build !linux
11-
// +build !netbsd
12-
// +build !openbsd
13-
// +build !solaris !go1.20
14-
// +build !windows
156

167
package ld
178

0 commit comments

Comments
 (0)