--- libgo/go/cmd/go/note_test.go.orig	2020-03-04 19:30:03.000000000 +1100
+++ libgo/go/cmd/go/note_test.go	2020-09-08 00:18:04.736023000 +1000
@@ -50,7 +50,7 @@
 	}
 
 	switch runtime.GOOS {
-	case "dragonfly", "freebsd", "linux", "netbsd", "openbsd":
+	case "bsdsunix", "dragonfly", "freebsd", "linux", "netbsd", "openbsd":
 		// Test while forcing use of the gold linker, since in the past
 		// we've had trouble reading the notes generated by gold.
 		err := tg.doRun([]string{"build", "-ldflags", "-buildid=" + buildID + " -linkmode=external -extldflags=-fuse-ld=gold", "-o", tg.path("hello3.exe"), tg.path("hello.go")})