From b49c3ac2d50c1aed28bc55b09415ad8d861237e9 Mon Sep 17 00:00:00 2001 From: Dominik Vogt Date: Tue, 13 Jan 2015 12:36:44 +0100 Subject: [PATCH] cmd/cgo: add support for s390 and s390x This patch was previously sent for review using hg: golang.org/cl/173930043 Change-Id: I559a2f2ee07990d0c23d2580381e32f8e23077a5 Reviewed-on: https://go-review.googlesource.com/3033 Reviewed-by: Ian Lance Taylor --- src/cmd/cgo/gcc.go | 4 ++++ src/cmd/cgo/main.go | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/cmd/cgo/gcc.go b/src/cmd/cgo/gcc.go index e217ddcf0b..4bc4d794c8 100644 --- a/src/cmd/cgo/gcc.go +++ b/src/cmd/cgo/gcc.go @@ -739,6 +739,10 @@ func (p *Package) gccMachine() []string { return []string{"-m32"} case "arm": return []string{"-marm"} // not thumb + case "s390": + return []string{"-m31"} + case "s390x": + return []string{"-m64"} } return nil } diff --git a/src/cmd/cgo/main.go b/src/cmd/cgo/main.go index ad8b960e2f..4dbcf62709 100644 --- a/src/cmd/cgo/main.go +++ b/src/cmd/cgo/main.go @@ -135,6 +135,8 @@ var ptrSizeMap = map[string]int64{ "arm": 4, "ppc64": 8, "ppc64le": 8, + "s390": 4, + "s390x": 8, } var intSizeMap = map[string]int64{ @@ -143,6 +145,8 @@ var intSizeMap = map[string]int64{ "arm": 4, "ppc64": 8, "ppc64le": 8, + "s390": 4, + "s390x": 4, } var cPrefix string -- 2.48.1