aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2018-05-04 01:34:30 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-05-04 01:34:30 +0000
commit652293284321e34fa1d87ad70c28a854b5b47580 (patch)
treea9a9eeee039e6d87b7e8e3de6831a7a0fef92747 /gcc
parente7902c2c8f7a7b84fb2637319af2d7cf9cf42096 (diff)
downloadgcc-652293284321e34fa1d87ad70c28a854b5b47580.zip
gcc-652293284321e34fa1d87ad70c28a854b5b47580.tar.gz
gcc-652293284321e34fa1d87ad70c28a854b5b47580.tar.bz2
cmd/go: update to match recent changes to gc
In https://golang.org/cl/111097 the gc version of cmd/go was updated to include some gofrontend-specific changes. The gofrontend code already has different versions of those changes; this CL makes the gofrontend match the upstream code. Reviewed-on: https://go-review.googlesource.com/111099 From-SVN: r259918
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 614333d..c45c918 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-85ca682349af2cb1aa6b1eecac794aeb73d24f15
+bf6f714559bd7b27b7686811aaf0f6e8e7f1c0d5
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.