--- libgo/go/runtime/crash_unix_test.go.orig	2020-03-04 19:30:03.000000000 +1100
+++ libgo/go/runtime/crash_unix_test.go	2020-09-08 13:23:08.888897000 +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 linux netbsd openbsd solaris
+// +build aix bsdsunix darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package runtime_test
 
@@ -35,7 +35,7 @@
 
 func TestCrashDumpsAllThreads(t *testing.T) {
 	switch runtime.GOOS {
-	case "darwin", "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "solaris":
+	case "bsdsunix", "darwin", "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "solaris":
 	default:
 		t.Skipf("skipping; not supported on %v", runtime.GOOS)
 	}
@@ -274,7 +274,7 @@
 
 func TestSignalDuringExec(t *testing.T) {
 	switch runtime.GOOS {
-	case "darwin", "dragonfly", "freebsd", "linux", "netbsd", "openbsd":
+	case "bsdsunix", "darwin", "dragonfly", "freebsd", "linux", "netbsd", "openbsd":
 	default:
 		t.Skipf("skipping test on %s", runtime.GOOS)
 	}