Index: src/cmd/dist/build.go
--- src/cmd/dist/build.go.orig
+++ src/cmd/dist/build.go
@@ -577,8 +577,7 @@ func mustLinkExternal(goos, goarch string, cgoEnabled 
 	if cgoEnabled {
 		switch goarch {
 		case "loong64",
-			"mips", "mipsle", "mips64", "mips64le",
-			"riscv64":
+			"mips", "mipsle", "mips64", "mips64le":
 			// Internally linking cgo is incomplete on some architectures.
 			// https://golang.org/issue/14449
 			return true
@@ -1732,6 +1731,7 @@ var cgoEnabled = map[string]bool{
 	"openbsd/arm64":   true,
 	"openbsd/mips64":  true,
 	"openbsd/ppc64":   false,
+	"openbsd/riscv64": true,
 	"plan9/386":       false,
 	"plan9/amd64":     false,
 	"plan9/arm":       false,
@@ -1749,7 +1749,6 @@ var cgoEnabled = map[string]bool{
 var broken = map[string]bool{
 	"linux/sparc64":  true, // An incomplete port. See CL 132155.
 	"openbsd/ppc64":  true, // An incomplete port: go.dev/issue/56001.
-	"openbsd/mips64": true, // Broken: go.dev/issue/58110.
 }
 
 // List of platforms which are first class ports. See go.dev/issue/38874.