From: Hyang-Ah Hana Kim <hyangah@gmail.com>
Date: Tue, 20 Oct 2015 04:24:03 +0000 (-0400)
Subject: cmd/go: allow -buildmode=pie for android/amd64.
X-Git-Tag: go1.6beta1~695
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=bcc5c6aa502f3efda253a8e1f6680a6aab7ca966;p=gostls13.git

cmd/go: allow -buildmode=pie for android/amd64.

For golang/go#10743 golang/go#10807

Change-Id: I35dedb52e2b47fe7ffc655d01f22ac05fe830bde
Reviewed-on: https://go-review.googlesource.com/16396
Reviewed-by: David Crawshaw <crawshaw@golang.org>
---

diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
index 285627288a..966603ec08 100644
--- a/src/cmd/go/build.go
+++ b/src/cmd/go/build.go
@@ -361,7 +361,7 @@ func buildModeInit() {
 		ldBuildmode = "c-shared"
 	case "default":
 		switch platform {
-		case "android/arm":
+		case "android/arm", "android/amd64":
 			codegenArg = "-shared"
 			ldBuildmode = "pie"
 		default:
@@ -375,7 +375,7 @@ func buildModeInit() {
 			fatalf("-buildmode=pie not supported by gccgo")
 		} else {
 			switch platform {
-			case "android/arm", "linux/amd64":
+			case "android/arm", "linux/amd64", "android/amd64":
 				codegenArg = "-shared"
 			default:
 				fatalf("-buildmode=pie not supported on %s\n", platform)