1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-25 12:15:32 +03:00
aports/community/go/default-buildmode-pie.patch
Natanael Copa 1c27f15788 community/go: fix build on s390x
disable tests without libgcc on s390x
2019-09-20 08:31:18 +00:00

27 lines
985 B
Diff

diff --git a/src/cmd/go/internal/work/init.go b/src/cmd/go/internal/work/init.go
index 7f894f5..a37cbf3 100644
--- a/src/cmd/go/internal/work/init.go
+++ b/src/cmd/go/internal/work/init.go
@@ -111,7 +111,8 @@ func buildModeInit() {
ldBuildmode = "c-shared"
case "default":
switch platform {
- case "android/arm", "android/arm64", "android/amd64", "android/386":
+ case "linux/amd64", "linux/arm", "linux/arm64", "linux/386", "linux/ppc64le", "linux/s390x",
+ "android/amd64", "android/arm", "android/arm64", "android/386":
codegenArg = "-shared"
ldBuildmode = "pie"
case "darwin/arm", "darwin/arm64":
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index f63c946..80ad134 100644
--- a/src/cmd/dist/test.go
+++ b/src/cmd/dist/test.go
@@ -553,7 +553,7 @@ func (t *tester) registerTests() {
}
// ARM libgcc may be Thumb, which internal linking does not support.
- if goarch == "arm" {
+ if goarch == "arm" || goarch == "s390x" {
break
}