aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-10-11 21:16:49 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-10-11 21:16:49 +0000
commit3ff1b2b0a91e25bf5b6499025a7c336a0b71b75f (patch)
treed8d689d283d005e340df4d2e9459f6f463c13390 /gcc
parent07a5fe52c547185a5fc9ef5b0f205016c3ee35f3 (diff)
downloadgcc-3ff1b2b0a91e25bf5b6499025a7c336a0b71b75f.zip
gcc-3ff1b2b0a91e25bf5b6499025a7c336a0b71b75f.tar.gz
gcc-3ff1b2b0a91e25bf5b6499025a7c336a0b71b75f.tar.bz2
runtime: fix issues on AIX about uintptr(_t)
Reviewed-on: https://go-review.googlesource.com/69891 From-SVN: r253664
Diffstat (limited to 'gcc')
-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 acb1d95..41f809f 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-adc6eb826f156d0980f0ad9f9efc5c919ec4905e
+af46ad16dc34773877068393d331ac8ae34b2219
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.