--- libgo/go/cmd/go/internal/work/init.go.orig	2020-03-04 19:30:03.000000000 +1100
+++ libgo/go/cmd/go/internal/work/init.go	2020-09-08 10:14:37.189161000 +1000
@@ -43,8 +43,8 @@
 		fmt.Fprintf(os.Stderr, "-msan is not supported on %s/%s\n", cfg.Goos, cfg.Goarch)
 		os.Exit(2)
 	}
-	if cfg.Goarch != "amd64" || cfg.Goos != "linux" && cfg.Goos != "freebsd" && cfg.Goos != "darwin" && cfg.Goos != "windows" {
-		fmt.Fprintf(os.Stderr, "go %s: -race and -msan are only supported on linux/amd64, freebsd/amd64, darwin/amd64 and windows/amd64\n", flag.Args()[0])
+	if cfg.Goarch != "amd64" || cfg.Goos != "linux" && cfg.Goos != "bsdsunix" && cfg.Goos != "freebsd" && cfg.Goos != "darwin" && cfg.Goos != "windows" {
+		fmt.Fprintf(os.Stderr, "go %s: -race and -msan are only supported on bsdsunix/amd64, linux/amd64, freebsd/amd64, darwin/amd64 and windows/amd64\n", flag.Args()[0])
 		os.Exit(2)
 	}
 
@@ -82,7 +82,7 @@
 			codegenArg = "-shared"
 		default:
 			switch cfg.Goos {
-			case "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "solaris":
+			case "bsdsunix", "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "solaris":
 				// Use -shared so that the result is
 				// suitable for inclusion in a PIE or
 				// shared library.