aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2018-10-26 16:53:24 +0000
committerIan Lance Taylor <iant@golang.org>2018-10-26 16:53:24 +0000
commita0b4107df63145b6f1a63387bda7dfb8e0167b19 (patch)
tree97304d33342f61a893d85db3d4edc8f01ae00892
parent9f0601714010a754af7d8398fc473c9ab77ae2be (diff)
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 git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@265533 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/go/log/syslog/syslog_c.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index ada5f3f731d..ef6ce579423 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.
diff --git a/libgo/go/log/syslog/syslog_c.c b/libgo/go/log/syslog/syslog_c.c
index 5b33d78288b..36e76942ba9 100644
--- a/libgo/go/log/syslog/syslog_c.c
+++ b/libgo/go/log/syslog/syslog_c.c
@@ -12,7 +12,7 @@
can't represent a C varargs function in Go. */
void syslog_c(intgo, const char*)
- __asm__ (GOSYM_PREFIX "log_syslog.syslog_c");
+ __asm__ (GOSYM_PREFIX "log..z2fsyslog.syslog_c");
void
syslog_c (intgo priority, const char *msg)