aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/go')
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--gcc/go/gofrontend/gogo.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 522d408..1456026 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-5af62eda697da21155091cf5375ed9edb4639b67
+722990deeede7801e4ed3ca5d53ce312a19fcd7a
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/gcc/go/gofrontend/gogo.cc b/gcc/go/gofrontend/gogo.cc
index 3ff88cb..e7af673 100644
--- a/gcc/go/gofrontend/gogo.cc
+++ b/gcc/go/gofrontend/gogo.cc
@@ -2541,7 +2541,7 @@ Gogo::add_linkname(const std::string& go_name, bool is_exported,
{
if (ext_name.empty())
go_error_at(loc,
- ("//%<go:linkname%> missing external name "
+ ("%<//go:linkname%> missing external name "
"for declaration of %s"),
go_name.c_str());
else