--- go/src/cmd/go/build.go.orig	2016-07-07 11:52:03.315793199 +0300
+++ go/src/cmd/go/build.go	2016-04-20 02:50:07.000000000 +0300
@@ -363,7 +363,8 @@
 		ldBuildmode = "c-shared"
 	case "default":
 		switch platform {
+		case "linux/386", "linux/amd64", "linux/arm", "linux/arm64", "linux/ppc64le", "linux/s390x",
+			"android/amd64", "android/arm", "android/arm64", "android/386":
-		case "android/arm", "android/arm64", "android/amd64", "android/386":
 			codegenArg = "-shared"
 			ldBuildmode = "pie"
 		default: