From: Hyang-Ah Hana Kim <hyangah@gmail.com>
Date: Wed, 11 Nov 2015 21:34:06 +0000 (-0500)
Subject: cmd: enable android/386 build (buildmode=pie by default)
X-Git-Tag: go1.6beta1~412
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=888aadfa6088cc1654bb4f0c6bb61675ce360dfb;p=gostls13.git

cmd: enable android/386 build (buildmode=pie by default)

no buildmode=c-shared yet.

Update golang/go#9327.

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

diff --git a/src/cmd/compile/internal/gc/lex.go b/src/cmd/compile/internal/gc/lex.go
index 1f468c1dea..d6567d0c9c 100644
--- a/src/cmd/compile/internal/gc/lex.go
+++ b/src/cmd/compile/internal/gc/lex.go
@@ -222,7 +222,7 @@ func Main() {
 	var flag_shared int
 	var flag_dynlink bool
 	switch Thearch.Thechar {
-	case '5', '6', '7', '9':
+	case '5', '6', '7', '8', '9':
 		obj.Flagcount("shared", "generate code that can be linked into a shared library", &flag_shared)
 	}
 	if Thearch.Thechar == '6' {
diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
index 3d68715b01..3e0f7642dd 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", "android/arm64", "android/amd64":
+		case "android/arm", "android/arm64", "android/amd64", "android/386":
 			codegenArg = "-shared"
 			ldBuildmode = "pie"
 		default:
@@ -375,7 +375,8 @@ func buildModeInit() {
 			fatalf("-buildmode=pie not supported by gccgo")
 		} else {
 			switch platform {
-			case "linux/arm", "android/arm", "linux/amd64", "android/amd64", "linux/arm64", "android/arm64", "linux/ppc64le":
+			case "linux/amd64", "linux/arm", "linux/arm64", "linux/ppc64le",
+				"android/amd64", "android/arm", "android/arm64", "android/386":
 				codegenArg = "-shared"
 			default:
 				fatalf("-buildmode=pie not supported on %s\n", platform)