cmd/cgo: add mips64p32* to ptrSizeMap and intSizeMap

    Reviewed-on: https://go-review.googlesource.com/46152

From-SVN: r249475

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 74d94b9b0e16d7f339995ec01e6430088247b73b..d9c21fa3ce892f885f5ad4720f3b09f439f51f4e 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-c49c752b4d2934cff325dd540821c4b27cc61a05
+5a97e51022e3b7798f985714ced3e02d6e730b54
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.

diff --git a/libgo/go/cmd/cgo/main.go b/libgo/go/cmd/cgo/main.go
index c91c830260fac95e7bae0a84e4abd6810a0aa6cf..e8f3a0334b0202893e7db1aa90a22f5fce9b2bf0 100644 (file)
--- a/libgo/go/cmd/cgo/main.go
+++ b/libgo/go/cmd/cgo/main.go
@@ -139,51 +139,55 @@ func usage() {
 }
 
 var ptrSizeMap = map[string]int64{
-       "386":      4,
-       "alpha":    8,
-       "amd64":    8,
-       "arm":      4,
-       "arm64":    8,
-       "m68k":     4,
-       "mipso32":  4,
-       "mipsn32":  4,
-       "mipso64":  8,
-       "mipsn64":  8,
-       "mips":     4,
-       "mipsle":   4,
-       "mips64":   8,
-       "mips64le": 8,
-       "ppc":      4,
-       "ppc64":    8,
-       "ppc64le":  8,
-       "s390":     4,
-       "s390x":    8,
-       "sparc":    4,
-       "sparc64":  8,
+       "386":         4,
+       "alpha":       8,
+       "amd64":       8,
+       "arm":         4,
+       "arm64":       8,
+       "m68k":        4,
+       "mipso32":     4,
+       "mipsn32":     4,
+       "mipso64":     8,
+       "mipsn64":     8,
+       "mips":        4,
+       "mipsle":      4,
+       "mips64":      8,
+       "mips64le":    8,
+       "mips64p32":   4,
+       "mips64p32le": 4,
+       "ppc":         4,
+       "ppc64":       8,
+       "ppc64le":     8,
+       "s390":        4,
+       "s390x":       8,
+       "sparc":       4,
+       "sparc64":     8,
 }
 
 var intSizeMap = map[string]int64{
-       "386":      4,
-       "alpha":    8,
-       "amd64":    8,
-       "arm":      4,
-       "arm64":    8,
-       "m68k":     4,
-       "mipso32":  4,
-       "mipsn32":  4,
-       "mipso64":  8,
-       "mipsn64":  8,
-       "mips":     4,
-       "mipsle":   4,
-       "mips64":   8,
-       "mips64le": 8,
-       "ppc":      4,
-       "ppc64":    8,
-       "ppc64le":  8,
-       "s390":     4,
-       "s390x":    8,
-       "sparc":    4,
-       "sparc64":  8,
+       "386":         4,
+       "alpha":       8,
+       "amd64":       8,
+       "arm":         4,
+       "arm64":       8,
+       "m68k":        4,
+       "mipso32":     4,
+       "mipsn32":     4,
+       "mipso64":     8,
+       "mipsn64":     8,
+       "mips":        4,
+       "mipsle":      4,
+       "mips64":      8,
+       "mips64le":    8,
+       "mips64p32":   8,
+       "mips64p32le": 8,
+       "ppc":         4,
+       "ppc64":       8,
+       "ppc64le":     8,
+       "s390":        4,
+       "s390x":       8,
+       "sparc":       4,
+       "sparc64":     8,
 }
 
 var cPrefix string