aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2018-01-19 04:09:55 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-01-19 04:09:55 +0000
commit549e4febc34ae8ef2ef13f621e7fe69cb73e1aee (patch)
treea892c363528bcc777c992688c6b6f8f22b48e413 /gcc
parent502a18ca457465a358e9a595fc9071a5f065fb4a (diff)
downloadgcc-549e4febc34ae8ef2ef13f621e7fe69cb73e1aee.zip
gcc-549e4febc34ae8ef2ef13f621e7fe69cb73e1aee.tar.gz
gcc-549e4febc34ae8ef2ef13f621e7fe69cb73e1aee.tar.bz2
runtime: add go:noescape declaration for Solaris
Patch by Rainer Orth. Reviewed-on: https://go-review.googlesource.com/88376 From-SVN: r256872
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 93e7215..1a51e10 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-925635f067d40d30acf565b620cc859ee7cbc990
+6b4f1391e2cd637fa5ed797bb3ab43d9ede61997
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.