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 <iant@golang.org>

diff --git a/src/cmd/cgo/gcc.go b/src/cmd/cgo/gcc.go
index e217ddcf0b75f695cf660b415d2b35ad56948ec9..4bc4d794c848b2b78306c4cfbd0f6489b047c27b 100644 (file)
--- 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 ad8b960e2f73d0602ec5a070c0770ede0863b6ed..4dbcf6270961d877847a2be7ade97466d8e2ea08 100644 (file)
--- 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