From fe5258b41ea2e363aea1494dcf52754fea9b42db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Fri, 15 Feb 2019 00:51:34 +0200 Subject: [PATCH] vendor: pull in upstream syscall fixes for non-linux/arm64 (cherry picked from commit 9d3ea8df1c70be24e5814e8338dfc9078b8ccafe) --- .../x/sys/cpu/{cpu_arm64.go => cpu_linux_arm64.go} | 0 vendor/golang.org/x/sys/cpu/cpu_other_arm64.go | 11 +++++++++++ vendor/vendor.json | 14 +++++++------- 3 files changed, 18 insertions(+), 7 deletions(-) rename vendor/golang.org/x/sys/cpu/{cpu_arm64.go => cpu_linux_arm64.go} (100%) create mode 100644 vendor/golang.org/x/sys/cpu/cpu_other_arm64.go diff --git a/vendor/golang.org/x/sys/cpu/cpu_arm64.go b/vendor/golang.org/x/sys/cpu/cpu_linux_arm64.go similarity index 100% rename from vendor/golang.org/x/sys/cpu/cpu_arm64.go rename to vendor/golang.org/x/sys/cpu/cpu_linux_arm64.go diff --git a/vendor/golang.org/x/sys/cpu/cpu_other_arm64.go b/vendor/golang.org/x/sys/cpu/cpu_other_arm64.go new file mode 100644 index 0000000000..dd1e76dc92 --- /dev/null +++ b/vendor/golang.org/x/sys/cpu/cpu_other_arm64.go @@ -0,0 +1,11 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build !linux,arm64 + +package cpu + +const cacheLineSize = 64 + +func doinit() {} diff --git a/vendor/vendor.json b/vendor/vendor.json index f8ee76d1e2..e28f84cbbc 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -785,22 +785,22 @@ "revisionTime": "2017-05-17T20:25:26Z" }, { - "checksumSHA1": "1CmUDjhZlyKZcbLYlWI7cRzK3fI=", + "checksumSHA1": "2HmF5lkH5eTCChFqqUPKGyZq46o=", "path": "golang.org/x/sys/cpu", - "revision": "983097b1a8a340cd1cc7df17d735154d89e10b1a", - "revisionTime": "2019-02-13T08:58:22Z" + "revision": "e77772198cdc3dbfcf7f2de96630204df9fd3a0b", + "revisionTime": "2019-02-14T21:28:15Z" }, { "checksumSHA1": "k8nyiVwbKd7N/Lo9z85y6v/03NE=", "path": "golang.org/x/sys/unix", - "revision": "983097b1a8a340cd1cc7df17d735154d89e10b1a", - "revisionTime": "2019-02-13T08:58:22Z" + "revision": "e77772198cdc3dbfcf7f2de96630204df9fd3a0b", + "revisionTime": "2019-02-14T21:28:15Z" }, { "checksumSHA1": "IwB9A6UjgGYrHIBFJEamnrXPeNo=", "path": "golang.org/x/sys/windows", - "revision": "983097b1a8a340cd1cc7df17d735154d89e10b1a", - "revisionTime": "2019-02-13T08:58:22Z" + "revision": "e77772198cdc3dbfcf7f2de96630204df9fd3a0b", + "revisionTime": "2019-02-14T21:28:15Z" }, { "checksumSHA1": "Mr4ur60bgQJnQFfJY0dGtwWwMPE=",