aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2019-01-21 23:05:52 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2019-01-21 23:05:52 +0000
commitea31c98daba7d3459dc5500049876fe0a71a89d3 (patch)
tree9dc7ee584a37d93ea00455a5ec27d75fa464bf58 /gcc
parenta9647bf912b9d2eeb9297bb96d5274eb8c9ed75c (diff)
downloadgcc-ea31c98daba7d3459dc5500049876fe0a71a89d3.zip
gcc-ea31c98daba7d3459dc5500049876fe0a71a89d3.tar.gz
gcc-ea31c98daba7d3459dc5500049876fe0a71a89d3.tar.bz2
libgo: fix building, and some testing, on Solaris
Restore some of the fixes that were applied to golang_org/x/net/lif but were lost when 1.12 moved the directory to internal/x/net/lif. Add support for reading /proc to fetch argc/argv/env for c-archive mode. Reviewed-on: https://go-review.googlesource.com/c/158640 From-SVN: r268130
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 c5b51b7..8f42329 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-e7427654f3af83e1feea727a62a97172d7721403
+0c870ba6b3b43e0e56231f40c56b58dad0e36d9e
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.