diff options
author | dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> | 2020-10-13 08:18:04 +0000 |
---|---|---|
committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-10-13 16:22:29 -0400 |
commit | 9066292ee4015d6a3971acd1a69f15941128ed0f (patch) | |
tree | 974e0e6a3707400d13fcde17e7c3d86beaa7b8c5 /vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go | |
parent | d1ba9ce555099ad4cf2fd49c4598edaae0bfe0e4 (diff) | |
download | podman-9066292ee4015d6a3971acd1a69f15941128ed0f.tar.gz podman-9066292ee4015d6a3971acd1a69f15941128ed0f.tar.bz2 podman-9066292ee4015d6a3971acd1a69f15941128ed0f.zip |
Bump github.com/onsi/gomega from 1.10.2 to 1.10.3
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.10.2 to 1.10.3.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](https://github.com/onsi/gomega/compare/v1.10.2...v1.10.3)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
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 | 6 |
1 files changed, 5 insertions, 1 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 7d08dae5b..57a0021da 100644 --- a/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go +++ b/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go @@ -20,7 +20,7 @@ func cmsgAlignOf(salen int) int { case "aix": // There is no alignment on AIX. salign = 1 - case "darwin", "illumos", "solaris": + case "darwin", "ios", "illumos", "solaris": // NOTE: It seems like 64-bit Darwin, Illumos and Solaris // kernels still require 32-bit aligned access to network // subsystem. @@ -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) |