aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-06-21 21:50:52 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-06-21 21:50:52 +0000
commit95eebd21db8b4b389a7fa4075ffc64df086b61ed (patch)
tree54b371f8a6b292491ae2cc5c60c32e39d8edb64c /gcc/go
parent4c0478b33873f8201c103d0910d7f1d5dcfc2979 (diff)
downloadgcc-95eebd21db8b4b389a7fa4075ffc64df086b61ed.zip
gcc-95eebd21db8b4b389a7fa4075ffc64df086b61ed.tar.gz
gcc-95eebd21db8b4b389a7fa4075ffc64df086b61ed.tar.bz2
cmd/cgo: add mips64p32* to ptrSizeMap and intSizeMap
Reviewed-on: https://go-review.googlesource.com/46152 From-SVN: r249475
Diffstat (limited to 'gcc/go')
-rw-r--r--gcc/go/gofrontend/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 74d94b9..d9c21fa 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.