aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2018-12-07 14:22:55 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-12-07 14:22:55 +0000
commit5a58929be88a9f83881668f3d0fb7961c4ef5e58 (patch)
treeecec095d73053cc0c20d7e86a8d3d571a84ce8ac
parente914864fab272605a6f07580f7e30a2a452d69a1 (diff)
downloadgcc-5a58929be88a9f83881668f3d0fb7961c4ef5e58.zip
gcc-5a58929be88a9f83881668f3d0fb7961c4ef5e58.tar.gz
gcc-5a58929be88a9f83881668f3d0fb7961c4ef5e58.tar.bz2
runtime: add missing return for non-GNU/Linux version of tgkill
Path from Rainer Orth. Reviewed-on: https://go-review.googlesource.com/c/153118 From-SVN: r266890
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/go/runtime/stubs_nonlinux.go1
2 files changed, 2 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index b71d71f..062f9c7 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-edc7e7172e674b8c7e9c3caa30e24280cd289a9c
+f0266d382f8965b7bcaa380aa963498c1884505e
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/libgo/go/runtime/stubs_nonlinux.go b/libgo/go/runtime/stubs_nonlinux.go
index 4cdab0c..325d35d 100644
--- a/libgo/go/runtime/stubs_nonlinux.go
+++ b/libgo/go/runtime/stubs_nonlinux.go
@@ -17,4 +17,5 @@ func gettid() _pid_t {
func tgkill(pid _pid_t, tid _pid_t, sig uint32) uint32 {
throw("tgkill not implemented")
+ return 0
}