cmd/link: enable internal linking by default on darwin/arm64

cherrymui · cherrymui · commit b85c2dd56c4e · 2020-10-28T14:25:56.000Z
With previous CLs, internal linking without cgo should work well. Enable it by default. And stop always requiring cgo. Enable tests that were previously disabled due to the lack of internal linking. Updates golang#38485. Change-Id: I45125b9c263fd21d6847aa6b14ecaea3a2989b29 Reviewed-on: https://go-review.googlesource.com/c/go/+/265121 Trust: Cherry Zhang <cherryyz@google.com> Reviewed-by: Austin Clements <austin@google.com> Reviewed-by: Than McIntosh <thanm@google.com>
diff --git a/src/cmd/go/internal/load/pkg.go b/src/cmd/go/internal/load/pkg.go
@@ -1964,10 +1964,6 @@ func externalLinkingForced(p *Package) bool {
 		}
 	case "ios":
 		return true
-	case "darwin":
-		if cfg.BuildContext.GOARCH == "arm64" {
-			return true
-		}
 	}
 
 	// Currently build modes c-shared, pie (on systems that do not
diff --git a/src/cmd/internal/sys/supported.go b/src/cmd/internal/sys/supported.go
@@ -39,7 +39,7 @@ func MustLinkExternal(goos, goarch string) bool {
 		if goarch != "arm64" {
 			return true
 		}
-	case "darwin", "ios":
+	case "ios":
 		if goarch == "arm64" {
 			return true
 		}
diff --git a/src/cmd/link/internal/ld/config.go b/src/cmd/link/internal/ld/config.go
@@ -185,7 +185,7 @@ func mustLinkExternal(ctxt *Link) (res bool, reason string) {
 		}()
 	}
 
-	if sys.MustLinkExternal(objabi.GOOS, objabi.GOARCH) && !(objabi.GOOS == "darwin" && objabi.GOARCH == "arm64") { // XXX allow internal linking for darwin/arm64 but not change the default
+	if sys.MustLinkExternal(objabi.GOOS, objabi.GOARCH) {
 		return true, fmt.Sprintf("%s/%s requires external linking", objabi.GOOS, objabi.GOARCH)
 	}
 
@@ -261,8 +261,6 @@ func determineLinkMode(ctxt *Link) {
 		default:
 			if extNeeded || (iscgo && externalobj) {
 				ctxt.LinkMode = LinkExternal
-			} else if ctxt.IsDarwin() && ctxt.IsARM64() {
-				ctxt.LinkMode = LinkExternal // default to external linking for now
 			} else {
 				ctxt.LinkMode = LinkInternal
 			}
diff --git a/src/cmd/nm/nm_cgo_test.go b/src/cmd/nm/nm_cgo_test.go
@@ -15,11 +15,6 @@ func canInternalLink() bool {
 	switch runtime.GOOS {
 	case "aix":
 		return false
-	case "darwin":
-		switch runtime.GOARCH {
-		case "arm64":
-			return false
-		}
 	case "dragonfly":
 		return false
 	case "freebsd":
diff --git a/src/internal/testenv/testenv.go b/src/internal/testenv/testenv.go
@@ -201,7 +201,7 @@ func CanInternalLink() bool {
 		if runtime.GOARCH != "arm64" {
 			return false
 		}
-	case "darwin", "ios":
+	case "ios":
 		if runtime.GOARCH == "arm64" {
 			return false
 		}
diff --git a/test/fixedbugs/bug429_run.go b/test/fixedbugs/bug429_run.go
@@ -1,10 +1,6 @@
 // run
 
 // +build !nacl,!js
-// +build !darwin !arm64
-
-// Skip on darwin/arm64 as it requires external linking, which brings in
-// cgo, causing deadlock detection not working.
 
 // Copyright 2014 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/fixedbugs/issue21576.go b/test/fixedbugs/issue21576.go
@@ -1,10 +1,6 @@
 // run
 
 // +build !nacl,!js
-// +build !darwin !arm64
-
-// Skip on darwin/arm64 as it requires external linking, which brings in
-// cgo, causing deadlock detection not working.
 
 // Copyright 2019 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

Original file line number	Diff line number	Diff line change
`@@ -1964,10 +1964,6 @@ func externalLinkingForced(p *Package) bool {`
`1964`	`1964`	`}`
`1965`	`1965`	`case "ios":`
`1966`	`1966`	`return true`
`1967`		`- case "darwin":`
`1968`		`- if cfg.BuildContext.GOARCH == "arm64" {`
`1969`		`- return true`
`1970`		`- }`
`1971`	`1967`	`}`
`1972`	`1968`
`1973`	`1969`	`// Currently build modes c-shared, pie (on systems that do not`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ func MustLinkExternal(goos, goarch string) bool {`
`39`	`39`	`if goarch != "arm64" {`
`40`	`40`	`return true`
`41`	`41`	`}`
`42`		`- case "darwin", "ios":`
	`42`	`+ case "ios":`
`43`	`43`	`if goarch == "arm64" {`
`44`	`44`	`return true`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ func mustLinkExternal(ctxt *Link) (res bool, reason string) {`
`185`	`185`	`}()`
`186`	`186`	`}`
`187`	`187`
`188`		`- if sys.MustLinkExternal(objabi.GOOS, objabi.GOARCH) && !(objabi.GOOS == "darwin" && objabi.GOARCH == "arm64") { // XXX allow internal linking for darwin/arm64 but not change the default`
	`188`	`+ if sys.MustLinkExternal(objabi.GOOS, objabi.GOARCH) {`
`189`	`189`	`return true, fmt.Sprintf("%s/%s requires external linking", objabi.GOOS, objabi.GOARCH)`
`190`	`190`	`}`
`191`	`191`
`@@ -261,8 +261,6 @@ func determineLinkMode(ctxt *Link) {`
`261`	`261`	`default:`
`262`	`262`	`if extNeeded \|\| (iscgo && externalobj) {`
`263`	`263`	`ctxt.LinkMode = LinkExternal`
`264`		`- } else if ctxt.IsDarwin() && ctxt.IsARM64() {`
`265`		`- ctxt.LinkMode = LinkExternal // default to external linking for now`
`266`	`264`	`} else {`
`267`	`265`	`ctxt.LinkMode = LinkInternal`
`268`	`266`	`}`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ func CanInternalLink() bool {`
`201`	`201`	`if runtime.GOARCH != "arm64" {`
`202`	`202`	`return false`
`203`	`203`	`}`
`204`		`- case "darwin", "ios":`
	`204`	`+ case "ios":`
`205`	`205`	`if runtime.GOARCH == "arm64" {`
`206`	`206`	`return false`
`207`	`207`	`}`