summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Siegert <bsiegert@gmail.com>2019-02-28 13:58:11 +0100
committerTobias Klauser <tobias.klauser@gmail.com>2019-02-28 13:29:53 +0000
commit336ae0d242bca424d0a0a48b663d290af7968ba9 (patch)
tree542b7c6fe88b94cb0dd8ee3dc51f7b05c2cc9790
parentc2b707bcf18e763a1fafc7c6fe955c64760df255 (diff)
downloadgo-git-336ae0d242bca424d0a0a48b663d290af7968ba9.tar.gz
cmd: update vendored golang.org/x/sys/unix
This pulls in CL 164497. Fixes #24771 Change-Id: I88f2062e2c42363591dcb9e592a7a8381268ddeb Reviewed-on: https://go-review.googlesource.com/c/164460 Reviewed-by: Tobias Klauser <tobias.klauser@gmail.com> Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com> TryBot-Result: Gobot Gobot <gobot@golang.org>
-rw-r--r--src/cmd/vendor/golang.org/x/sys/unix/sockcmsg_unix.go4
-rw-r--r--src/cmd/vendor/vendor.json6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/cmd/vendor/golang.org/x/sys/unix/sockcmsg_unix.go b/src/cmd/vendor/golang.org/x/sys/unix/sockcmsg_unix.go
index 5f9ae233a7..26e8b36cfc 100644
--- a/src/cmd/vendor/golang.org/x/sys/unix/sockcmsg_unix.go
+++ b/src/cmd/vendor/golang.org/x/sys/unix/sockcmsg_unix.go
@@ -25,8 +25,8 @@ func cmsgAlignOf(salen int) int {
if SizeofPtr == 8 {
salign = 4
}
- case "openbsd":
- // OpenBSD armv7 requires 64-bit alignment.
+ case "netbsd", "openbsd":
+ // NetBSD and OpenBSD armv7 require 64-bit alignment.
if runtime.GOARCH == "arm" {
salign = 8
}
diff --git a/src/cmd/vendor/vendor.json b/src/cmd/vendor/vendor.json
index 053e2afc4f..93b94aef12 100644
--- a/src/cmd/vendor/vendor.json
+++ b/src/cmd/vendor/vendor.json
@@ -135,10 +135,10 @@
"revisionTime": "2018-05-24T11:38:20Z"
},
{
- "checksumSHA1": "v0kuTLSywKZmIwuyR3JyT18CgZk=",
+ "checksumSHA1": "/4HmlX92To16u5s2bryHkTS4+CM=",
"path": "golang.org/x/sys/unix",
- "revision": "cc5685c2db1239775905f3911f0067c0fa74762f",
- "revisionTime": "2019-02-24T20:24:49Z"
+ "revision": "a34e9553db1e492c9a76e60db2296ae7e5fbb772",
+ "revisionTime": "2019-02-28T12:11:59Z"
},
{
"checksumSHA1": "/G/UvW6DnpLWoplv0wkB3JunvXk=",