diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-24 16:52:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 16:52:02 +0200 |
| commit | 72260a296c534950d9c899ee907e73b5dd0162f0 (patch) | |
| tree | d9b33042a70c2d1e600c75855a29b3aa594aaab6 /vendor/golang.org/x/sys/unix/sockcmsg_unix.go | |
| parent | cf244d87cdb9b2cb0d8510b2ea392d928c1eb269 (diff) | |
| parent | d697456dc90adbaf68224ed7c115b38d5855e582 (diff) | |
| download | podman-72260a296c534950d9c899ee907e73b5dd0162f0.tar.gz podman-72260a296c534950d9c899ee907e73b5dd0162f0.tar.bz2 podman-72260a296c534950d9c899ee907e73b5dd0162f0.zip | |
Merge pull request #3414 from vrothberg/go-modules
Go modules
Diffstat (limited to 'vendor/golang.org/x/sys/unix/sockcmsg_unix.go')
| -rw-r--r-- | vendor/golang.org/x/sys/unix/sockcmsg_unix.go | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/vendor/golang.org/x/sys/unix/sockcmsg_unix.go b/vendor/golang.org/x/sys/unix/sockcmsg_unix.go index 5f9ae233a..062bcabab 100644 --- a/vendor/golang.org/x/sys/unix/sockcmsg_unix.go +++ b/vendor/golang.org/x/sys/unix/sockcmsg_unix.go @@ -18,15 +18,18 @@ func cmsgAlignOf(salen int) int { salign := SizeofPtr switch runtime.GOOS { - case "darwin", "dragonfly", "solaris": - // NOTE: It seems like 64-bit Darwin, DragonFly BSD and - // Solaris kernels still require 32-bit aligned access to - // network subsystem. + case "aix": + // There is no alignment on AIX. + salign = 1 + case "darwin", "dragonfly", "solaris", "illumos": + // NOTE: It seems like 64-bit Darwin, DragonFly BSD, + // illumos, and Solaris kernels still require 32-bit + // aligned access to network subsystem. 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 } |