diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-10-06 21:00:36 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-10-06 21:58:41 +1100 |
| commit | 0aed47737c8f366c5e6895c57f0b193ff0eb43a3 (patch) | |
| tree | 1206e3075357a3f4561ba937859d69df7f3537db /vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go | |
| parent | 6e076472b8fb2d052e0b1c35d3fff3dd263ae722 (diff) | |
bump go-git to fix invalid merge error
Diffstat (limited to 'vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go')
| -rw-r--r-- | vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go | 4 |
1 files changed, 4 insertions, 0 deletions
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) |