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/sentry/kernel | |
| parent | ab1c2bd3680ffe5ff4a614bc320a9b367f3fdc8d (diff) | |
| parent | 964fb3ca768756fbc58d1d9312c53886964ae608 (diff) | |
Merge release-20210720.0-39-g964fb3ca7 (automated)
Diffstat (limited to 'pkg/sentry/kernel')
10 files changed, 18 insertions, 36 deletions
diff --git a/pkg/sentry/kernel/auth/auth_abi_autogen_unsafe.go b/pkg/sentry/kernel/auth/auth_abi_autogen_unsafe.go index 8ec71bc50..393dcea8c 100644 --- a/pkg/sentry/kernel/auth/auth_abi_autogen_unsafe.go +++ b/pkg/sentry/kernel/auth/auth_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 auth import ( diff --git a/pkg/sentry/kernel/auth/auth_unsafe_abi_autogen_unsafe.go b/pkg/sentry/kernel/auth/auth_unsafe_abi_autogen_unsafe.go index 7f4cbed94..ebcd3911b 100644 --- a/pkg/sentry/kernel/auth/auth_unsafe_abi_autogen_unsafe.go +++ b/pkg/sentry/kernel/auth/auth_unsafe_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 auth import ( diff --git a/pkg/sentry/kernel/kernel_abi_autogen_unsafe.go b/pkg/sentry/kernel/kernel_abi_autogen_unsafe.go index f951fab78..83ed0f8ac 100644 --- a/pkg/sentry/kernel/kernel_abi_autogen_unsafe.go +++ b/pkg/sentry/kernel/kernel_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 kernel import ( diff --git a/pkg/sentry/kernel/kernel_amd64_abi_autogen_unsafe.go b/pkg/sentry/kernel/kernel_amd64_abi_autogen_unsafe.go index 49bde618c..988351acf 100644 --- a/pkg/sentry/kernel/kernel_amd64_abi_autogen_unsafe.go +++ b/pkg/sentry/kernel/kernel_amd64_abi_autogen_unsafe.go @@ -1,11 +1,12 @@ // 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(). +//go:build amd64 // +build amd64 package kernel diff --git a/pkg/sentry/kernel/kernel_amd64_state_autogen.go b/pkg/sentry/kernel/kernel_amd64_state_autogen.go index 12de47ad0..859999676 100644 --- a/pkg/sentry/kernel/kernel_amd64_state_autogen.go +++ b/pkg/sentry/kernel/kernel_amd64_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build amd64 // +build amd64 package kernel diff --git a/pkg/sentry/kernel/kernel_arm64_abi_autogen_unsafe.go b/pkg/sentry/kernel/kernel_arm64_abi_autogen_unsafe.go index ed40b65c6..823d08b19 100644 --- a/pkg/sentry/kernel/kernel_arm64_abi_autogen_unsafe.go +++ b/pkg/sentry/kernel/kernel_arm64_abi_autogen_unsafe.go @@ -1,11 +1,12 @@ // 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(). +//go:build arm64 // +build arm64 package kernel diff --git a/pkg/sentry/kernel/kernel_arm64_state_autogen.go b/pkg/sentry/kernel/kernel_arm64_state_autogen.go index 3c040d283..7340674a6 100644 --- a/pkg/sentry/kernel/kernel_arm64_state_autogen.go +++ b/pkg/sentry/kernel/kernel_arm64_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build arm64 // +build arm64 package kernel diff --git a/pkg/sentry/kernel/kernel_opts_abi_autogen_unsafe.go b/pkg/sentry/kernel/kernel_opts_abi_autogen_unsafe.go index 3e0693a12..dcca4b9dd 100644 --- a/pkg/sentry/kernel/kernel_opts_abi_autogen_unsafe.go +++ b/pkg/sentry/kernel/kernel_opts_abi_autogen_unsafe.go @@ -1,11 +1,12 @@ // 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(). +//go:build go1.1 // +build go1.1 package kernel diff --git a/pkg/sentry/kernel/kernel_opts_state_autogen.go b/pkg/sentry/kernel/kernel_opts_state_autogen.go index 3a027c5ed..d878d9a06 100644 --- a/pkg/sentry/kernel/kernel_opts_state_autogen.go +++ b/pkg/sentry/kernel/kernel_opts_state_autogen.go @@ -1,5 +1,6 @@ // automatically generated by stateify. +//go:build go1.1 // +build go1.1 package kernel diff --git a/pkg/sentry/kernel/kernel_unsafe_abi_autogen_unsafe.go b/pkg/sentry/kernel/kernel_unsafe_abi_autogen_unsafe.go index 9c39d630a..5d810c89c 100644 --- a/pkg/sentry/kernel/kernel_unsafe_abi_autogen_unsafe.go +++ b/pkg/sentry/kernel/kernel_unsafe_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 kernel import ( |