From 95eebd21db8b4b389a7fa4075ffc64df086b61ed Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Wed, 21 Jun 2017 21:50:52 +0000
Subject: [PATCH] cmd/cgo: add mips64p32* to ptrSizeMap and intSizeMap

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

From-SVN: r249475
---
 gcc/go/gofrontend/MERGE  |  2 +-
 libgo/go/cmd/cgo/main.go | 88 +++++++++++++++++++++-------------------
 2 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 74d94b9b0e1..d9c21fa3ce8 100644
--- 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 c91c830260f..e8f3a0334b0 100644
--- 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
-- 
2.30.2