diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-07-28 01:18:12 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-07-28 01:18:12 +0000 |
| commit | a41384306d0ab75f6b0ceac3d5e0047531e3ad4f (patch) | |
| tree | d019e4466c09d970d368402ea4bf7f5d597fb0f2 /pkg/abi | |
| parent | ab1c2bd3680ffe5ff4a614bc320a9b367f3fdc8d (diff) | |
| parent | 964fb3ca768756fbc58d1d9312c53886964ae608 (diff) | |
Merge release-20210720.0-39-g964fb3ca7 (automated)
Diffstat (limited to 'pkg/abi')
| -rw-r--r-- | pkg/abi/abi_linux_state_autogen.go | 1 | ||||
| -rw-r--r-- | pkg/abi/linux/linux_abi_autogen_unsafe.go | 6 | ||||
| -rw-r--r-- | pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go | 17 | ||||
| -rw-r--r-- | pkg/abi/linux/linux_amd64_state_autogen.go | 7 | ||||
| -rw-r--r-- | pkg/abi/linux/linux_arm64_abi_autogen_unsafe.go | 14 | ||||
| -rw-r--r-- | pkg/abi/linux/linux_arm64_state_autogen.go | 6 |
6 files changed, 18 insertions, 33 deletions
diff --git a/pkg/abi/abi_linux_state_autogen.go b/pkg/abi/abi_linux_state_autogen.go index 327ef0e5c..8a1390439 100644 --- a/pkg/abi/abi_linux_state_autogen.go +++ b/pkg/abi/abi_linux_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build linux // +build linux package abi diff --git a/pkg/abi/linux/linux_abi_autogen_unsafe.go b/pkg/abi/linux/linux_abi_autogen_unsafe.go index 29dadddbf..11cf350d2 100644 --- a/pkg/abi/linux/linux_abi_autogen_unsafe.go +++ b/pkg/abi/linux/linux_abi_autogen_unsafe.go @@ -1,11 +1,5 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here -// come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). - package linux import ( diff --git a/pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go b/pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go index 1d479c196..770b19c2f 100644 --- a/pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go +++ b/pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go @@ -1,16 +1,13 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here +// If there are issues with build constraint aggregation, see +// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here // come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). - -// +build amd64 -// +build amd64 -// +build amd64 -// +build amd64 -// +build amd64 +// is filtered based on pre-defined file suffixes related to build constraints, +// see tools/defs.bzl:calculate_sets(). + +//go:build amd64 && amd64 && amd64 && amd64 && amd64 +// +build amd64,amd64,amd64,amd64,amd64 package linux diff --git a/pkg/abi/linux/linux_amd64_state_autogen.go b/pkg/abi/linux/linux_amd64_state_autogen.go index d233a69df..b824c1dd9 100644 --- a/pkg/abi/linux/linux_amd64_state_autogen.go +++ b/pkg/abi/linux/linux_amd64_state_autogen.go @@ -1,10 +1,7 @@ // automatically generated by stateify. -// +build amd64 -// +build amd64 -// +build amd64 -// +build amd64 -// +build amd64 +//go:build amd64 && amd64 && amd64 && amd64 && amd64 +// +build amd64,amd64,amd64,amd64,amd64 package linux diff --git a/pkg/abi/linux/linux_arm64_abi_autogen_unsafe.go b/pkg/abi/linux/linux_arm64_abi_autogen_unsafe.go index db4980c14..06c2aec98 100644 --- a/pkg/abi/linux/linux_arm64_abi_autogen_unsafe.go +++ b/pkg/abi/linux/linux_arm64_abi_autogen_unsafe.go @@ -1,15 +1,13 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// If there are issues with build tag aggregation, see -// tools/go_marshal/gomarshal/generator.go:writeHeader(). The build tags here +// If there are issues with build constraint aggregation, see +// tools/go_marshal/gomarshal/generator.go:writeHeader(). The constraints here // come from the input set of files used to generate this file. This input set -// is filtered based on pre-defined file suffixes related to build tags, see -// tools/defs.bzl:calculate_sets(). +// is filtered based on pre-defined file suffixes related to build constraints, +// see tools/defs.bzl:calculate_sets(). -// +build arm64 -// +build arm64 -// +build arm64 -// +build arm64 +//go:build arm64 && arm64 && arm64 && arm64 +// +build arm64,arm64,arm64,arm64 package linux diff --git a/pkg/abi/linux/linux_arm64_state_autogen.go b/pkg/abi/linux/linux_arm64_state_autogen.go index 8b08b2925..1994658e5 100644 --- a/pkg/abi/linux/linux_arm64_state_autogen.go +++ b/pkg/abi/linux/linux_arm64_state_autogen.go @@ -1,9 +1,7 @@ // automatically generated by stateify. -// +build arm64 -// +build arm64 -// +build arm64 -// +build arm64 +//go:build arm64 && arm64 && arm64 && arm64 +// +build arm64,arm64,arm64,arm64 package linux |