Merge release-20200127.0-65-g95ce8bb (automated)

4 files changed, 45 insertions, 14 deletions

diff --git a/pkg/sentry/arch/arch_aarch64_state_autogen.go b/pkg/sentry/arch/arch_aarch64_state_autogen.go
new file mode 100755
index 000000000..3e0685928
--- /dev/null
+++ b/pkg/sentry/arch/arch_aarch64_state_autogen.go
@@ -0,0 +1,7 @@
+// automatically generated by stateify.
+
+// +build arm64
+// +build arm64
+
+package arch
+
diff --git a/pkg/sentry/arch/arch_amd64_state_autogen.go b/pkg/sentry/arch/arch_amd64_state_autogen.go
new file mode 100755
index 000000000..c431519e7
--- /dev/null
+++ b/pkg/sentry/arch/arch_amd64_state_autogen.go
@@ -0,0 +1,28 @@
+// automatically generated by stateify.
+
+// +build amd64
+// +build amd64
+// +build amd64
+
+package arch
+
+import (
+	"gvisor.dev/gvisor/pkg/state"
+)
+
+func (x *context64) beforeSave() {}
+func (x *context64) save(m state.Map) {
+	x.beforeSave()
+	m.Save("State", &x.State)
+	m.Save("sigFPState", &x.sigFPState)
+}
+
+func (x *context64) afterLoad() {}
+func (x *context64) load(m state.Map) {
+	m.Load("State", &x.State)
+	m.Load("sigFPState", &x.sigFPState)
+}
+
+func init() {
+	state.Register("arch.context64", (*context64)(nil), state.Fns{Save: (*context64).save, Load: (*context64).load})
+}
diff --git a/pkg/sentry/arch/arch_arm64_state_autogen.go b/pkg/sentry/arch/arch_arm64_state_autogen.go
new file mode 100755
index 000000000..4d56ebcca
--- /dev/null
+++ b/pkg/sentry/arch/arch_arm64_state_autogen.go
@@ -0,0 +1,6 @@
+// automatically generated by stateify.
+
+// +build arm64
+
+package arch
+
diff --git a/pkg/sentry/arch/arch_state_autogen.go b/pkg/sentry/arch/arch_state_autogen.go
index 9b1205531..3381f26c8 100755
--- a/pkg/sentry/arch/arch_state_autogen.go
+++ b/pkg/sentry/arch/arch_state_autogen.go
@@ -1,5 +1,9 @@
 // automatically generated by stateify.
 
+// +build amd64 i386
+// +build amd64 i386
+// +build i386 amd64 arm64
+
 package arch
 
 import (
@@ -27,19 +31,6 @@ func (x *MmapLayout) load(m state.Map) {
 	m.Load("MaxStackRand", &x.MaxStackRand)
 }
 
-func (x *context64) beforeSave() {}
-func (x *context64) save(m state.Map) {
-	x.beforeSave()
-	m.Save("State", &x.State)
-	m.Save("sigFPState", &x.sigFPState)
-}
-
-func (x *context64) afterLoad() {}
-func (x *context64) load(m state.Map) {
-	m.Load("State", &x.State)
-	m.Load("sigFPState", &x.sigFPState)
-}
-
 func (x *syscallPtraceRegs) beforeSave() {}
 func (x *syscallPtraceRegs) save(m state.Map) {
 	x.beforeSave()
@@ -183,7 +174,6 @@ func (x *SignalInfo) load(m state.Map) {
 
 func init() {
 	state.Register("arch.MmapLayout", (*MmapLayout)(nil), state.Fns{Save: (*MmapLayout).save, Load: (*MmapLayout).load})
-	state.Register("arch.context64", (*context64)(nil), state.Fns{Save: (*context64).save, Load: (*context64).load})
 	state.Register("arch.syscallPtraceRegs", (*syscallPtraceRegs)(nil), state.Fns{Save: (*syscallPtraceRegs).save, Load: (*syscallPtraceRegs).load})
 	state.Register("arch.State", (*State)(nil), state.Fns{Save: (*State).save, Load: (*State).load})
 	state.Register("arch.AuxEntry", (*AuxEntry)(nil), state.Fns{Save: (*AuxEntry).save, Load: (*AuxEntry).load})