diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-05-07 20:23:43 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-05-07 20:23:43 +0000 |
| commit | 03a34f6ddde4ba3c45ace56a6328bf85197625b4 (patch) | |
| tree | 680396b6e1b7929a44632681eb89b18b19b458ab /pkg/sentry/arch | |
| parent | 03daf4f9759e35beea2663b171f134fc48dde512 (diff) | |
| parent | 1f4087e7cd6c3cc696e6b26446abd6c5214cfd67 (diff) | |
Merge release-20200422.0-51-g1f4087e (automated)
Diffstat (limited to 'pkg/sentry/arch')
| -rwxr-xr-x | pkg/sentry/arch/arch_abi_autogen_unsafe.go | 2 | ||||
| -rwxr-xr-x | pkg/sentry/arch/arch_state_autogen.go | 2 | ||||
| -rwxr-xr-x | pkg/sentry/arch/arch_x86_abi_autogen_unsafe.go | 10 | ||||
| -rwxr-xr-x | pkg/sentry/arch/arch_x86_impl_abi_autogen_unsafe.go (renamed from pkg/sentry/arch/arch_impl_abi_autogen_unsafe.go) | 0 | ||||
| -rwxr-xr-x | pkg/sentry/arch/arch_x86_impl_state_autogen.go (renamed from pkg/sentry/arch/arch_impl_state_autogen.go) | 0 | ||||
| -rwxr-xr-x | pkg/sentry/arch/arch_x86_state_autogen.go | 6 |
6 files changed, 16 insertions, 4 deletions
diff --git a/pkg/sentry/arch/arch_abi_autogen_unsafe.go b/pkg/sentry/arch/arch_abi_autogen_unsafe.go index 3e94c6144..98cc11f75 100755 --- a/pkg/sentry/arch/arch_abi_autogen_unsafe.go +++ b/pkg/sentry/arch/arch_abi_autogen_unsafe.go @@ -1,7 +1,5 @@ // Automatically generated marshal implementation. See tools/go_marshal. -// +build amd64 386 -// +build amd64 386 // +build 386 amd64 arm64 package arch diff --git a/pkg/sentry/arch/arch_state_autogen.go b/pkg/sentry/arch/arch_state_autogen.go index bb4bcda4b..82f4d9d73 100755 --- a/pkg/sentry/arch/arch_state_autogen.go +++ b/pkg/sentry/arch/arch_state_autogen.go @@ -1,7 +1,5 @@ // automatically generated by stateify. -// +build amd64 386 -// +build amd64 386 // +build 386 amd64 arm64 package arch diff --git a/pkg/sentry/arch/arch_x86_abi_autogen_unsafe.go b/pkg/sentry/arch/arch_x86_abi_autogen_unsafe.go new file mode 100755 index 000000000..521dcbb06 --- /dev/null +++ b/pkg/sentry/arch/arch_x86_abi_autogen_unsafe.go @@ -0,0 +1,10 @@ +// Automatically generated marshal implementation. See tools/go_marshal. + +// +build amd64 386 +// +build amd64 386 + +package arch + +import ( +) + diff --git a/pkg/sentry/arch/arch_impl_abi_autogen_unsafe.go b/pkg/sentry/arch/arch_x86_impl_abi_autogen_unsafe.go index 4357dc093..4357dc093 100755 --- a/pkg/sentry/arch/arch_impl_abi_autogen_unsafe.go +++ b/pkg/sentry/arch/arch_x86_impl_abi_autogen_unsafe.go diff --git a/pkg/sentry/arch/arch_impl_state_autogen.go b/pkg/sentry/arch/arch_x86_impl_state_autogen.go index 7303bb17f..7303bb17f 100755 --- a/pkg/sentry/arch/arch_impl_state_autogen.go +++ b/pkg/sentry/arch/arch_x86_impl_state_autogen.go diff --git a/pkg/sentry/arch/arch_x86_state_autogen.go b/pkg/sentry/arch/arch_x86_state_autogen.go new file mode 100755 index 000000000..20eaa99a6 --- /dev/null +++ b/pkg/sentry/arch/arch_x86_state_autogen.go @@ -0,0 +1,6 @@ +// automatically generated by stateify. + +// +build amd64 386 +// +build amd64 386 + +package arch |