Skip to content

Commit

Permalink
Revert "cmd/cgo, cmd/compile, cmd/link: remove old style build tags"
Browse files Browse the repository at this point in the history
This reverts commit 6616573, 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 <[email protected]>
  • Loading branch information
thanm authored and dr2chase committed Sep 30, 2022
1 parent 13159fe commit 902da52
Show file tree
Hide file tree
Showing 33 changed files with 53 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/cmd/cgo/ast_go1.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// license that can be found in the LICENSE file.

//go:build compiler_bootstrap
// +build compiler_bootstrap

package main

Expand Down
1 change: 1 addition & 0 deletions src/cmd/cgo/ast_go118.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// license that can be found in the LICENSE file.

//go:build !compiler_bootstrap
// +build !compiler_bootstrap

package main

Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/base/bootstrap_false.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// license that can be found in the LICENSE file.

//go:build !compiler_bootstrap
// +build !compiler_bootstrap

package base

Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/base/bootstrap_true.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// license that can be found in the LICENSE file.

//go:build compiler_bootstrap
// +build compiler_bootstrap

package base

Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/base/mapfile_mmap.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 7 additions & 0 deletions src/cmd/compile/internal/base/mapfile_read.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/ir/mknode.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/ssa/flags_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// license that can be found in the LICENSE file.

//go:build amd64 || arm64
// +build amd64 arm64

package ssa

Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/ssa/gen/386Ops.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// license that can be found in the LICENSE file.

//go:build ignore
// +build ignore

package main

Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/ssa/gen/AMD64Ops.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// license that can be found in the LICENSE file.

//go:build ignore
// +build ignore

package main

Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/ssa/gen/ARM64Ops.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// license that can be found in the LICENSE file.

//go:build ignore
// +build ignore

package main

Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/ssa/gen/ARMOps.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// license that can be found in the LICENSE file.

//go:build ignore
// +build ignore

package main

Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/ssa/gen/LOONG64Ops.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// license that can be found in the LICENSE file.

//go:build ignore
// +build ignore

package main

Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/ssa/gen/MIPS64Ops.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// license that can be found in the LICENSE file.

//go:build ignore
// +build ignore

package main

Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/ssa/gen/MIPSOps.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// license that can be found in the LICENSE file.

//go:build ignore
// +build ignore

package main

Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/ssa/gen/PPC64Ops.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// license that can be found in the LICENSE file.

//go:build ignore
// +build ignore

package main

Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/ssa/gen/RISCV64Ops.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// license that can be found in the LICENSE file.

//go:build ignore
// +build ignore

package main

Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/ssa/gen/S390XOps.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// license that can be found in the LICENSE file.

//go:build ignore
// +build ignore

package main

Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/ssa/gen/WasmOps.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// license that can be found in the LICENSE file.

//go:build ignore
// +build ignore

package main

Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/ssa/gen/dec64Ops.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// license that can be found in the LICENSE file.

//go:build ignore
// +build ignore

package main

Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/ssa/gen/decOps.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// license that can be found in the LICENSE file.

//go:build ignore
// +build ignore

package main

Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/ssa/gen/genericOps.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// license that can be found in the LICENSE file.

//go:build ignore
// +build ignore

package main

Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/ssa/gen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/ssa/gen/rulegen.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/typecheck/builtin/runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
// to avoid depending on having a working compiler binary.

//go:build ignore
// +build ignore

package runtime

Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/typecheck/mkbuiltin.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
1 change: 1 addition & 0 deletions src/cmd/compile/internal/types2/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
// access to compiled packages for import.
//
//go:build !arm && !arm64
// +build !arm,!arm64

package types2_test

Expand Down
1 change: 1 addition & 0 deletions src/cmd/internal/bio/buf_mmap.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 7 additions & 0 deletions src/cmd/internal/bio/buf_nommap.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions src/cmd/link/elf_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions src/cmd/link/internal/ld/outbuf_mmap.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions src/cmd/link/internal/ld/outbuf_nofallocate.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// license that can be found in the LICENSE file.

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

package ld

Expand Down
9 changes: 9 additions & 0 deletions src/cmd/link/internal/ld/outbuf_nommap.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 902da52

Please sign in to comment.