From 0aed47737c8f366c5e6895c57f0b193ff0eb43a3 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Tue, 6 Oct 2020 21:00:36 +1100 Subject: bump go-git to fix invalid merge error --- vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go') diff --git a/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go b/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go index abdedcf1d..57a0021da 100644 --- a/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go +++ b/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go @@ -32,6 +32,10 @@ func cmsgAlignOf(salen int) int { if runtime.GOARCH == "arm" { salign = 8 } + // NetBSD aarch64 requires 128-bit alignment. + if runtime.GOOS == "netbsd" && runtime.GOARCH == "arm64" { + salign = 16 + } } return (salen + salign - 1) & ^(salign - 1) -- cgit v1.2.3