aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-06-29 15:17:20 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-06-29 15:17:20 +0000
commit8ff22ea5a8ee58457a7c16f3501e2731a92b9df8 (patch)
tree670e7a6423083672b8dc0142e429da3302db46da /gcc
parent1a7ad6ad6683c2254bdf705697a56d578e72e5c7 (diff)
downloadgcc-8ff22ea5a8ee58457a7c16f3501e2731a92b9df8.zip
gcc-8ff22ea5a8ee58457a7c16f3501e2731a92b9df8.tar.gz
gcc-8ff22ea5a8ee58457a7c16f3501e2731a92b9df8.tar.bz2
misc/cgo/testcarchive: fix test to work for gccgo
This test is not yet run, but it will be soon. Reviewed-on: https://go-review.googlesource.com/47038 From-SVN: r249795
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 fb28b1a..289383f 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-8c4d6fd19f6d5dc9b41be384c60507f2236f05ec
+12c65e8310956eb3cc412d9dc9f9e88cbd928c8e
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.