aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2016-11-18 16:03:13 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2016-11-18 16:03:13 +0000
commitd6255159e86e432a5825f463150f27c1fc5a0268 (patch)
tree356d413f3cd82dbe584ad7d102361dc23a5e300a /gcc
parentd519aeda8b73ab7a9697b1817ed4655dfb5bbdb4 (diff)
downloadgcc-d6255159e86e432a5825f463150f27c1fc5a0268.zip
gcc-d6255159e86e432a5825f463150f27c1fc5a0268.tar.gz
gcc-d6255159e86e432a5825f463150f27c1fc5a0268.tar.bz2
runtime: don't call __go_alloc/__go_free in environment functions
Reviewed-on: https://go-review.googlesource.com/33363 From-SVN: r242594
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 ce86c8d..6e29f40 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-2ab785788691ad289f838a0b3a6bc9013d0fc337
+fc4ca600b2fc6de81fd3c4014542d6a50593db1a
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.