Revert "cmd/cgo, cmd/compile, cmd/link: remove old style build tags"

This reverts commit 66165739828b8326b625463beb51ae510b2ab8dd, corresponding to CL 436915.

Reason for revert: this is causing some bootstrap build problems with older versions of Go 1.17, as I understand it. Still under investigation.

Change-Id: Idb6e17ff7b47004cbf87f967af6d84f214d8abb5
Reviewed-on: https://go-review.googlesource.com/c/go/+/435471
Reviewed-by: David Chase <drchase@google.com>

diff --git a/src/cmd/cgo/ast_go1.go b/src/cmd/cgo/ast_go1.go
index ce61d29095585c8f59f36f92c8cc969ca2249f7e..f52bf00d7cb946e9844f485352daec989435a2db 100644 (file)
--- a/src/cmd/cgo/ast_go1.go
+++ b/src/cmd/cgo/ast_go1.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build compiler_bootstrap
+// +build compiler_bootstrap
 
 package main
 

diff --git a/src/cmd/cgo/ast_go118.go b/src/cmd/cgo/ast_go118.go
index 9f759b8ee5f0ff76579e32efd3c824405bcd5244..db0108ed7268366a5dc0543645645bed443a3ecb 100644 (file)
--- a/src/cmd/cgo/ast_go118.go
+++ b/src/cmd/cgo/ast_go118.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !compiler_bootstrap
+// +build !compiler_bootstrap
 
 package main
 

diff --git a/src/cmd/compile/internal/base/bootstrap_false.go b/src/cmd/compile/internal/base/bootstrap_false.go
index ea6da4348f53971936dcfbeb2055f137ca246011..c77fcd730812d824c061d329ca0ed353d82a8b16 100644 (file)
--- a/src/cmd/compile/internal/base/bootstrap_false.go
+++ b/src/cmd/compile/internal/base/bootstrap_false.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !compiler_bootstrap
+// +build !compiler_bootstrap
 
 package base
 

diff --git a/src/cmd/compile/internal/base/bootstrap_true.go b/src/cmd/compile/internal/base/bootstrap_true.go
index d0c6c88f56f94cc20f559e1bff38252853ca3354..1eb58b2f9dc1ce86ca9fb095715e685e667cbb3e 100644 (file)
--- a/src/cmd/compile/internal/base/bootstrap_true.go
+++ b/src/cmd/compile/internal/base/bootstrap_true.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build compiler_bootstrap
+// +build compiler_bootstrap
 
 package base
 

diff --git a/src/cmd/compile/internal/base/mapfile_mmap.go b/src/cmd/compile/internal/base/mapfile_mmap.go
index 6c5a4213a2fda79cab38f421ced67d2809bde083..b01d0f4efc664718edffbacd760ef0e7bcd6ad59 100644 (file)
--- a/src/cmd/compile/internal/base/mapfile_mmap.go
+++ b/src/cmd/compile/internal/base/mapfile_mmap.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || (solaris && go1.20)
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris,go1.20
 
 package base
 

diff --git a/src/cmd/compile/internal/base/mapfile_read.go b/src/cmd/compile/internal/base/mapfile_read.go
index 5ac6272dc15226ab21b371ec0316d4cb297347e7..e84810ea347eed96c110545e6551ec8c722ac5e9 100644 (file)
--- a/src/cmd/compile/internal/base/mapfile_read.go
+++ b/src/cmd/compile/internal/base/mapfile_read.go
@@ -3,6 +3,13 @@
 // license that can be found in the LICENSE file.
 
 //go:build !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !(solaris && go1.20)
+// +build !darwin
+// +build !dragonfly
+// +build !freebsd
+// +build !linux
+// +build !netbsd
+// +build !openbsd
+// +build !solaris !go1.20
 
 package base
 

diff --git a/src/cmd/compile/internal/ir/mknode.go b/src/cmd/compile/internal/ir/mknode.go
index caf4ba01358cd8be4dee312488b6028c4cfa7a22..68d8999f832bf6b5eb11efcf439e91ee1bd6d6e2 100644 (file)
--- a/src/cmd/compile/internal/ir/mknode.go
+++ b/src/cmd/compile/internal/ir/mknode.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
+// +build ignore
 
 // Note: this program must be run in this directory.
 //   go run mknode.go

diff --git a/src/cmd/compile/internal/ssa/flags_test.go b/src/cmd/compile/internal/ssa/flags_test.go
index d0079ac5e83823d8e22ad414f88f61af3aa56bf5..0bc1097199464992994a2562a4f61795f2eb0f32 100644 (file)
--- a/src/cmd/compile/internal/ssa/flags_test.go
+++ b/src/cmd/compile/internal/ssa/flags_test.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build amd64 || arm64
+// +build amd64 arm64
 
 package ssa
 

diff --git a/src/cmd/compile/internal/ssa/gen/386Ops.go b/src/cmd/compile/internal/ssa/gen/386Ops.go
index 4b7fe9fe370e474fda41970846a95371ca4b8f5a..88e061151e10ea31bdd8af80f327554161983132 100644 (file)
--- a/src/cmd/compile/internal/ssa/gen/386Ops.go
+++ b/src/cmd/compile/internal/ssa/gen/386Ops.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
+// +build ignore
 
 package main
 

diff --git a/src/cmd/compile/internal/ssa/gen/AMD64Ops.go b/src/cmd/compile/internal/ssa/gen/AMD64Ops.go
index 65456a8f773e0d366efb546b170d1f5aa0050254..fc42fa5e28b8218a1e4a5752355731b779804ddb 100644 (file)
--- a/src/cmd/compile/internal/ssa/gen/AMD64Ops.go
+++ b/src/cmd/compile/internal/ssa/gen/AMD64Ops.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
+// +build ignore
 
 package main
 

diff --git a/src/cmd/compile/internal/ssa/gen/ARM64Ops.go b/src/cmd/compile/internal/ssa/gen/ARM64Ops.go
index 4ef949a17984880e9eb1c3e399301a4fe3842a27..0e6e6e4a5f3dbf95522b4a09b16a762aee206241 100644 (file)
--- a/src/cmd/compile/internal/ssa/gen/ARM64Ops.go
+++ b/src/cmd/compile/internal/ssa/gen/ARM64Ops.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
+// +build ignore
 
 package main
 

diff --git a/src/cmd/compile/internal/ssa/gen/ARMOps.go b/src/cmd/compile/internal/ssa/gen/ARMOps.go
index 99684e4e039353bb8f1cfa57d3cb255d5316280d..3803f273c1dafd5bd85354635d1dcc13673fe3e1 100644 (file)
--- a/src/cmd/compile/internal/ssa/gen/ARMOps.go
+++ b/src/cmd/compile/internal/ssa/gen/ARMOps.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
+// +build ignore
 
 package main
 

diff --git a/src/cmd/compile/internal/ssa/gen/LOONG64Ops.go b/src/cmd/compile/internal/ssa/gen/LOONG64Ops.go
index fdf42ec944df5d44c2f96b69fb37c0e0efa5b76a..a59b592445ac0cf49be866b005e8f7c7d3788d70 100644 (file)
--- a/src/cmd/compile/internal/ssa/gen/LOONG64Ops.go
+++ b/src/cmd/compile/internal/ssa/gen/LOONG64Ops.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
+// +build ignore
 
 package main
 

diff --git a/src/cmd/compile/internal/ssa/gen/MIPS64Ops.go b/src/cmd/compile/internal/ssa/gen/MIPS64Ops.go
index 59a9c8c7144fd92093570d963af7c51b8b7727d4..7b18c42ffb91e35c73e202a7e0b62f9dbb3b9754 100644 (file)
--- a/src/cmd/compile/internal/ssa/gen/MIPS64Ops.go
+++ b/src/cmd/compile/internal/ssa/gen/MIPS64Ops.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
+// +build ignore
 
 package main
 

diff --git a/src/cmd/compile/internal/ssa/gen/MIPSOps.go b/src/cmd/compile/internal/ssa/gen/MIPSOps.go
index 17ae3d4251716a290016012da224a4ff4fe77047..523847badc9ce2d77db0c54757e81e50e2d706bd 100644 (file)
--- a/src/cmd/compile/internal/ssa/gen/MIPSOps.go
+++ b/src/cmd/compile/internal/ssa/gen/MIPSOps.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
+// +build ignore
 
 package main
 

diff --git a/src/cmd/compile/internal/ssa/gen/PPC64Ops.go b/src/cmd/compile/internal/ssa/gen/PPC64Ops.go
index 4428ea62a78fb1002326a079d18900382bd20ffb..30a6f6fe07d4b88f9392bb1126b05062955ed644 100644 (file)
--- a/src/cmd/compile/internal/ssa/gen/PPC64Ops.go
+++ b/src/cmd/compile/internal/ssa/gen/PPC64Ops.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
+// +build ignore
 
 package main
 

diff --git a/src/cmd/compile/internal/ssa/gen/RISCV64Ops.go b/src/cmd/compile/internal/ssa/gen/RISCV64Ops.go
index 1d2d22643d0645bb8dcf40ed69af85d5d7a9456d..f09910782d5e24c399beda7bd416ced7046b37c4 100644 (file)
--- a/src/cmd/compile/internal/ssa/gen/RISCV64Ops.go
+++ b/src/cmd/compile/internal/ssa/gen/RISCV64Ops.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
+// +build ignore
 
 package main
 

diff --git a/src/cmd/compile/internal/ssa/gen/S390XOps.go b/src/cmd/compile/internal/ssa/gen/S390XOps.go
index 29cb260d87729261945710b9040fced40afc59db..eef8a2557ca39d51e91cb5c5715d3b4d5678c0a2 100644 (file)
--- a/src/cmd/compile/internal/ssa/gen/S390XOps.go
+++ b/src/cmd/compile/internal/ssa/gen/S390XOps.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
+// +build ignore
 
 package main
 

diff --git a/src/cmd/compile/internal/ssa/gen/WasmOps.go b/src/cmd/compile/internal/ssa/gen/WasmOps.go
index 1ba94eaa5fc221075e2dfa476145edfa59a3a15d..edfba4ee99b774962a26cedf43994527ee939d11 100644 (file)
--- a/src/cmd/compile/internal/ssa/gen/WasmOps.go
+++ b/src/cmd/compile/internal/ssa/gen/WasmOps.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
+// +build ignore
 
 package main
 

diff --git a/src/cmd/compile/internal/ssa/gen/dec64Ops.go b/src/cmd/compile/internal/ssa/gen/dec64Ops.go
index 24b23c00b7c6acd5997ccecb0f5c47fb4e56a628..78fcea885aa8b250304d0064e32ad0b03f52bc8e 100644 (file)
--- a/src/cmd/compile/internal/ssa/gen/dec64Ops.go
+++ b/src/cmd/compile/internal/ssa/gen/dec64Ops.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
+// +build ignore
 
 package main
 

diff --git a/src/cmd/compile/internal/ssa/gen/decOps.go b/src/cmd/compile/internal/ssa/gen/decOps.go
index 5449727a8a47d4697b62fe0b9866a304f16935bf..d5cd79378c76a3041e007bc197c171f7272a4bda 100644 (file)
--- a/src/cmd/compile/internal/ssa/gen/decOps.go
+++ b/src/cmd/compile/internal/ssa/gen/decOps.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
+// +build ignore
 
 package main
 

diff --git a/src/cmd/compile/internal/ssa/gen/genericOps.go b/src/cmd/compile/internal/ssa/gen/genericOps.go
index df649eeece50bd717913066a3a6b55609a2ef7ea..d09b9aab7573acbc29c33fad29812fd20ad28959 100644 (file)
--- a/src/cmd/compile/internal/ssa/gen/genericOps.go
+++ b/src/cmd/compile/internal/ssa/gen/genericOps.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
+// +build ignore
 
 package main
 

diff --git a/src/cmd/compile/internal/ssa/gen/main.go b/src/cmd/compile/internal/ssa/gen/main.go
index fd00df680dc8db0b3943376fb730f283c5bf2924..81740dcf1c02ac7d06caa90fbfa61c0fb18f97b2 100644 (file)
--- a/src/cmd/compile/internal/ssa/gen/main.go
+++ b/src/cmd/compile/internal/ssa/gen/main.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build ignore
+// +build ignore
 
 // The gen command generates Go code (in the parent directory) for all
 // the architecture-specific opcodes, blocks, and rewrites.

diff --git a/src/cmd/compile/internal/ssa/gen/rulegen.go b/src/cmd/compile/internal/ssa/gen/rulegen.go
index d7b4cfa612253d9239549542f984338eeb88d9ab..fc9b4c9b3e74b829ee53f983bc050a231975beec 100644 (file)
--- a/src/cmd/compile/internal/ssa/gen/rulegen.go
+++ b/src/cmd/compile/internal/ssa/gen/rulegen.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build gen
+// +build gen
 
 // This program generates Go code that applies rewrite rules to a Value.
 // The generated code implements a function of type func (v *Value) bool

diff --git a/src/cmd/compile/internal/typecheck/builtin/runtime.go b/src/cmd/compile/internal/typecheck/builtin/runtime.go
index 83695013c39cf8c8c4275ec0d8fdb47373f0ce5e..310148ce00ca4e0f1256b6c022faa15beea564c3 100644 (file)
--- a/src/cmd/compile/internal/typecheck/builtin/runtime.go
+++ b/src/cmd/compile/internal/typecheck/builtin/runtime.go
@@ -7,6 +7,7 @@
 // to avoid depending on having a working compiler binary.
 
 //go:build ignore
+// +build ignore
 
 package runtime
 

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

diff --git a/src/cmd/compile/internal/types2/example_test.go b/src/cmd/compile/internal/types2/example_test.go
index 9212c38560b1645c4f6bc58991601cde3fb8a2ae..ad0f22fcec4c8842857da1d2655aef50589d7497 100644 (file)
--- a/src/cmd/compile/internal/types2/example_test.go
+++ b/src/cmd/compile/internal/types2/example_test.go
@@ -6,6 +6,7 @@
 // access to compiled packages for import.
 //
 //go:build !arm && !arm64
+// +build !arm,!arm64
 
 package types2_test
 

diff --git a/src/cmd/internal/bio/buf_mmap.go b/src/cmd/internal/bio/buf_mmap.go
index e428952bc9f09f83bb8458e44167368200bc8c0d..3543637154312651c7d2d2b394644c94ba42aea2 100644 (file)
--- a/src/cmd/internal/bio/buf_mmap.go
+++ b/src/cmd/internal/bio/buf_mmap.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || (solaris && go1.20)
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris,go1.20
 
 package bio
 

diff --git a/src/cmd/internal/bio/buf_nommap.go b/src/cmd/internal/bio/buf_nommap.go
index e9048609831a2e0d5a5eb828353ddbd75784420e..dab3435260a14b0352461098164f3b5fcca14d25 100644 (file)
--- a/src/cmd/internal/bio/buf_nommap.go
+++ b/src/cmd/internal/bio/buf_nommap.go
@@ -3,6 +3,13 @@
 // license that can be found in the LICENSE file.
 
 //go:build !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !(solaris && go1.20)
+// +build !darwin
+// +build !dragonfly
+// +build !freebsd
+// +build !linux
+// +build !netbsd
+// +build !openbsd
+// +build !solaris !go1.20
 
 package bio
 

diff --git a/src/cmd/link/elf_test.go b/src/cmd/link/elf_test.go
index 6a94b264a1b36631ed73c7fc464d782a99d24363..5037f5b6c0d4b12b628f1a839d1e604c32bff95e 100644 (file)
--- a/src/cmd/link/elf_test.go
+++ b/src/cmd/link/elf_test.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build dragonfly || freebsd || linux || netbsd || openbsd
+// +build dragonfly freebsd linux netbsd openbsd
 
 package main
 

diff --git a/src/cmd/link/internal/ld/outbuf_mmap.go b/src/cmd/link/internal/ld/outbuf_mmap.go
index 7bb728a1f895d18270125a3f2d2eaf97d647cddc..d8f8a10db137f3f904c2aeaad75244df71e55e33 100644 (file)
--- a/src/cmd/link/internal/ld/outbuf_mmap.go
+++ b/src/cmd/link/internal/ld/outbuf_mmap.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || (solaris && go1.20)
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris,go1.20
 
 package ld
 

diff --git a/src/cmd/link/internal/ld/outbuf_nofallocate.go b/src/cmd/link/internal/ld/outbuf_nofallocate.go
index dd5afc61db92803e7ee004e0515fc7dc870c1938..6564bd54a3d1bcf27977493fedff76c829c34d0d 100644 (file)
--- a/src/cmd/link/internal/ld/outbuf_nofallocate.go
+++ b/src/cmd/link/internal/ld/outbuf_nofallocate.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:build !darwin && !linux
+// +build !darwin,!linux
 
 package ld
 

diff --git a/src/cmd/link/internal/ld/outbuf_nommap.go b/src/cmd/link/internal/ld/outbuf_nommap.go
index b1d3d2724f01a2172b5774c7f6d558a2e5aed77d..4154981b099df07f0236e06a051984aa77829e2d 100644 (file)
--- a/src/cmd/link/internal/ld/outbuf_nommap.go
+++ b/src/cmd/link/internal/ld/outbuf_nommap.go
@@ -3,6 +3,15 @@
 // license that can be found in the LICENSE file.
 
 //go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !(solaris && go1.20) && !windows
+// +build !aix
+// +build !darwin
+// +build !dragonfly
+// +build !freebsd
+// +build !linux
+// +build !netbsd
+// +build !openbsd
+// +build !solaris !go1.20
+// +build !windows
 
 package ld