summaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2017-01-26 19:07:54 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2017-01-26 19:07:54 +0000
commit0f4225caaf85459278cb6035647c83c959e6d29c (patch)
tree962832cf9778c19d47e3baa0e6b4b524143d58e9 /gcc/go
parent1d435a58b9460b5fec9b0edfafb2be649463dec6 (diff)
downloadgcc-0f4225caaf85459278cb6035647c83c959e6d29c.tar.gz
runtime: fix setting of isarchive
When I updated to Go 1.8, the initsig function moved from signal1_unix.go to signal_unix.go, and lost a gccgo-specific change in the move. Add it back. This would have been caught by the misc/cgo/testcarchive tests in the gc repository, but we don't run those in the gccgo repository. We should fix that, somehow. Reviewed-on: https://go-review.googlesource.com/35839 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@244947 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/go')
-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 29c971c25a0..7900e1a4aa7 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-f8c451ed42fd71b85afab54a33fc321df0ff3b0b
+2c62d5223e814887801b1540162c72b90299d910
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.