diff --git a/src/runtime/proc.go b/src/runtime/proc.go
index 2584eb4cac6..51e2c42605a 100644
--- a/src/runtime/proc.go
+++ b/src/runtime/proc.go
@@ -1816,10 +1816,8 @@ func startTheWorldWithSema(now int64, w worldStop) int64 {
 // via libcall.
 func usesLibcall() bool {
 	switch GOOS {
-	case "aix", "darwin", "illumos", "ios", "solaris", "windows":
+	case "aix", "darwin", "illumos", "ios", "openbsd", "solaris", "windows":
 		return true
-	case "openbsd":
-		return GOARCH != "mips64"
 	}
 	return false
 }
@@ -1828,10 +1826,8 @@ func usesLibcall() bool {
 // system-allocated stack.
 func mStackIsSystemAllocated() bool {
 	switch GOOS {
-	case "aix", "darwin", "plan9", "illumos", "ios", "solaris", "windows":
+	case "aix", "darwin", "plan9", "illumos", "ios", "openbsd", "solaris", "windows":
 		return true
-	case "openbsd":
-		return GOARCH != "mips64"
 	}
 	return false
 }