diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/cgo/gcc.go | 4 | ||||
| -rw-r--r-- | src/cmd/cgo/main.go | 4 |
2 files changed, 8 insertions, 0 deletions
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 |