diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-03-11 08:09:01 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-03-11 08:09:01 +0000 |
| commit | 1041d6c67e6406e5a9780934a1c3e6786f214cb6 (patch) | |
| tree | e3724b837cbb8ff40fdc65b1c827b24c9dfb269d /pkg/sentry/arch/arch_aarch64.go | |
| parent | c0100acc5d77703465a0ccb4a9edf6c5ecd482af (diff) | |
| parent | 24e7005ab6bd025f79da46883bd31151fab72147 (diff) | |
Merge release-20200219.0-136-g24e7005 (automated)
Diffstat (limited to 'pkg/sentry/arch/arch_aarch64.go')
| -rwxr-xr-x | pkg/sentry/arch/arch_aarch64.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkg/sentry/arch/arch_aarch64.go b/pkg/sentry/arch/arch_aarch64.go index 5053393c1..b998f84fc 100755 --- a/pkg/sentry/arch/arch_aarch64.go +++ b/pkg/sentry/arch/arch_aarch64.go @@ -95,6 +95,9 @@ type State struct { // Our floating point state. aarch64FPState `state:"wait"` + // TLS pointer + TPValue uint64 + // FeatureSet is a pointer to the currently active feature set. FeatureSet *cpuid.FeatureSet } @@ -145,6 +148,7 @@ func (s *State) Fork() State { return State{ Regs: s.Regs, aarch64FPState: s.aarch64FPState.fork(), + TPValue: s.TPValue, FeatureSet: s.FeatureSet, } } @@ -255,6 +259,7 @@ func (s *State) PtraceSetFPRegs(src io.Reader) (int, error) { const ( _NT_PRSTATUS = 1 _NT_PRFPREG = 2 + _NT_ARM_TLS = 0x401 ) // PtraceGetRegSet implements Context.PtraceGetRegSet. |