--- libgo/go/cmd/go/internal/work/exec.go.orig	2020-03-04 19:30:03.000000000 +1100
+++ libgo/go/cmd/go/internal/work/exec.go	2020-09-08 10:15:36.770156000 +1000
@@ -642,7 +642,7 @@
 	// This is read by readGccgoArchive in cmd/internal/buildid/buildid.go.
 	if a.buildID != "" && cfg.BuildToolchainName == "gccgo" {
 		switch cfg.Goos {
-		case "android", "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "solaris":
+		case "android", "bsdsunix", "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "solaris":
 			asmfile, err := b.gccgoBuildIDELFFile(a)
 			if err != nil {
 				return err