From: Benny Siegert <bsiegert@gmail.com>
Date: Thu, 28 Feb 2019 10:54:22 +0000 (+0100)
Subject: syscall: use 64-bit alignment on netbsd-arm
X-Git-Tag: go1.13beta1~1305
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=c2b707bcf18e763a1fafc7c6fe955c64760df255;p=gostls13.git

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 <tobias.klauser@gmail.com>
Reviewed-by: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

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
 		}