diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-10-29 20:23:30 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-10-29 20:23:30 +0000 |
| commit | a3fdb33c4583a9443abca60e479884e0bf45919f (patch) | |
| tree | 47e6019abb94433b53c1d35cf179cdf44e58b0e8 /pkg/procid | |
| parent | fd17402e9a4d1e8f6bbc381f0f28bdc104c09847 (diff) | |
| parent | c0b8fd4b6a9fcb595f3200577b93d07737cfaacd (diff) | |
Merge release-20190806.1-340-gc0b8fd4 (automated)
Diffstat (limited to 'pkg/procid')
| -rw-r--r-- | pkg/procid/procid_amd64.s | 2 | ||||
| -rw-r--r-- | pkg/procid/procid_arm64.s | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/procid/procid_amd64.s b/pkg/procid/procid_amd64.s index 30ec8e6e2..38cea9be3 100644 --- a/pkg/procid/procid_amd64.s +++ b/pkg/procid/procid_amd64.s @@ -14,7 +14,7 @@ // +build amd64 // +build go1.8 -// +build !go1.14 +// +build !go1.15 #include "textflag.h" diff --git a/pkg/procid/procid_arm64.s b/pkg/procid/procid_arm64.s index e340d9f98..4f4b70fef 100644 --- a/pkg/procid/procid_arm64.s +++ b/pkg/procid/procid_arm64.s @@ -14,7 +14,7 @@ // +build arm64 // +build go1.8 -// +build !go1.14 +// +build !go1.15 #include "textflag.h" |