diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/runtime/stubs_nonlinux.go | 1 |
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 } |