aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2018-10-26 16:53:24 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-10-26 16:53:24 +0000
commit797ea25427efeb91e73dc2e3e8c55f17de07c005 (patch)
tree97304d33342f61a893d85db3d4edc8f01ae00892 /gcc/go
parent4fa008a718f06108a3ddc06200c7947e0212075c (diff)
downloadgcc-797ea25427efeb91e73dc2e3e8c55f17de07c005.zip
gcc-797ea25427efeb91e73dc2e3e8c55f17de07c005.tar.gz
gcc-797ea25427efeb91e73dc2e3e8c55f17de07c005.tar.bz2
libgo: fix improperly mangled linker symbol directive
Fix asm name directive for the C version of log/syslog.syslog_c, which didn't get included in the recent name mangling change. Reviewed-on: https://go-review.googlesource.com/c/145017 From-SVN: r265533
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 ada5f3f..ef6ce57 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-0a58bd7d820dac8931e8da5b291f19c3c7e6bee3
+ad50884d2a4b653f7f20edc8b441fe6ad6570d55
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.