qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-06 19:36:30 -07:00
Code Releases Activity

syscall: use correct cmsg alignment for openbsd/arm

Browse Source 
The OpenBSD armv7 port requires 64-bit alignment for cmsgs.

Rework the cmsg alignment code to facilitate this.

Change-Id: I52cf55a8a4cda46c6ef35b0f694862b842028b42
Reviewed-on: https://go-review.googlesource.com/c/153837
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Joel Sing 2018-12-13 00:38:37 +11:00
parent 09da280157
commit bbae8d5508
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/syscall/sockcmsg_unix.go
View File

@ -8,17 +8,30 @@
package syscall package syscall
import "unsafe" import (
"runtime"
"unsafe"
)
// Round the length of a raw sockaddr up to align it properly. // Round the length of a raw sockaddr up to align it properly.
func cmsgAlignOf(salen int) int { func cmsgAlignOf(salen int) int {
salign := sizeofPtr salign := sizeofPtr
// NOTE: It seems like 64-bit Darwin, DragonFly BSD and
// Solaris kernels still require 32-bit aligned access to switch runtime.GOOS {
// network subsystem. case "darwin", "dragonfly", "solaris":
if darwin64Bit || dragonfly64Bit || solaris64Bit { // NOTE: It seems like 64-bit Darwin, DragonFly BSD and
salign = 4 // Solaris kernels still require 32-bit aligned access to
// network subsystem.
if sizeofPtr == 8 {
salign = 4
}
case "openbsd":
// OpenBSD armv7 requires 64-bit alignment.
if runtime.GOARCH == "arm" {
salign = 8
}
} }
return (salen + salign - 1) & ^(salign - 1) return (salen + salign - 1) & ^(salign - 1)
} }