--- libgo/go/os/user/cgo_lookup_unix.go.orig	2020-03-04 19:30:03.000000000 +1100
+++ libgo/go/os/user/cgo_lookup_unix.go	2020-09-22 00:12:46.862274000 +1000
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd !android,linux netbsd openbsd solaris
+// +build aix bsdsunix darwin dragonfly freebsd !android,linux netbsd openbsd solaris
 // +build cgo
 
 package user
@@ -207,7 +207,7 @@
 func (k bufferKind) initialSize() syscall.Size_t {
 	sz, _ := syscall.Sysconf(int(k))
 	if sz == -1 {
-		// DragonFly and FreeBSD do not have _SC_GETPW_R_SIZE_MAX.
+		// DragonFly, BSDSUniX and FreeBSD do not have _SC_GETPW_R_SIZE_MAX.
 		// Additionally, not all Linux systems have it, either. For
 		// example, the musl libc returns -1.
 		return 1024