--- libgo/go/debug/gosym/pclntab_test.go.orig	2020-03-04 19:30:03.000000000 +1100
+++ libgo/go/debug/gosym/pclntab_test.go	2020-09-08 00:16:55.901139000 +1000
@@ -79,7 +79,7 @@
 // These tests open and examine the test binary, and use elf.Open to do so.
 func skipIfNotELF(t *testing.T) {
 	switch runtime.GOOS {
-	case "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "solaris":
+	case "bsdsunix", "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "solaris":
 		// OK.
 	default:
 		t.Skipf("skipping on non-ELF system %s", runtime.GOOS)