From c2b707bcf18e763a1fafc7c6fe955c64760df255 Mon Sep 17 00:00:00 2001 From: Benny Siegert Date: Thu, 28 Feb 2019 11:54:22 +0100 Subject: [PATCH] syscall: use 64-bit alignment on netbsd-arm netbsd-arm needs the same override to the alignment function as openbsd-arm. This fixes the TestPassFD failure. Update golang/go#24771 Change-Id: Ib124fc776f6e2e3b3932784365c2bd3944523a52 Reviewed-on: https://go-review.googlesource.com/c/164458 Run-TryBot: Tobias Klauser Reviewed-by: Tobias Klauser TryBot-Result: Gobot Gobot --- src/syscall/sockcmsg_unix.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/syscall/sockcmsg_unix.go b/src/syscall/sockcmsg_unix.go index 954148012f..fa198686b1 100644 --- a/src/syscall/sockcmsg_unix.go +++ b/src/syscall/sockcmsg_unix.go @@ -25,8 +25,8 @@ func cmsgAlignOf(salen int) int { 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 } -- 2.48.1