From: Corne van der Plas <vdplas@gmail.com>
Date: Tue, 19 Nov 2019 12:22:55 +0000 (+0100)
Subject: cmd/link: Revert -buildmode=pie to internal linking
X-Git-Tag: go1.15beta1~1076
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b2696fde403a5b059936ac6dd22b6ec9a899e084;p=gostls13.git

cmd/link: Revert -buildmode=pie to internal linking

When internal linking was broken buildmode PIE is set to external
linking. Now internal linking is fixed, -buildmode=pie can default to
internal linking again.

Fixes #35545

Change-Id: Iaf86b3047eb76babebc1545a79125586a7a3980e
Reviewed-on: https://go-review.googlesource.com/c/go/+/207877
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
---

diff --git a/src/cmd/link/internal/ld/config.go b/src/cmd/link/internal/ld/config.go
index dcbe136832..86d8779512 100644
--- a/src/cmd/link/internal/ld/config.go
+++ b/src/cmd/link/internal/ld/config.go
@@ -244,7 +244,7 @@ func determineLinkMode(ctxt *Link) {
 			ctxt.LinkMode = LinkExternal
 			via = "via GO_EXTLINK_ENABLED "
 		default:
-			if extNeeded || (iscgo && externalobj) || ctxt.BuildMode == BuildModePIE {
+			if extNeeded || (iscgo && externalobj) {
 				ctxt.LinkMode = LinkExternal
 			} else {
 				ctxt.LinkMode = LinkInternal