runtime: enable sigPerThreadSyscall handling on android

CL 383434 forgot to enable these paths for android, which is still linux
just not via GOOS.

Fixes #51213.

Change-Id: I102e53e8671403ded6edb4ba04789154d7a0730b
Reviewed-on: https://go-review.googlesource.com/c/go/+/385954
Trust: Michael Pratt <mpratt@google.com>
Run-TryBot: Michael Pratt <mpratt@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Reviewed-by: Austin Clements <austin@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>

diff --git a/src/runtime/signal_unix.go b/src/runtime/signal_unix.go
index 6f25fc91fa2cf95c6effada85a88a4a483d1acd8..2dd4cc51a34ec12cb2232714b9cd04a9322678fd 100644 (file)
--- a/src/runtime/signal_unix.go
+++ b/src/runtime/signal_unix.go
@@ -161,7 +161,7 @@ func sigInstallGoHandler(sig uint32) bool {
                }
        }
 
-       if GOOS == "linux" && !iscgo && sig == sigPerThreadSyscall {
+       if (GOOS == "linux" || GOOS == "android") && !iscgo && sig == sigPerThreadSyscall {
                // sigPerThreadSyscall is the same signal used by glibc for
                // per-thread syscalls on Linux. We use it for the same purpose
                // in non-cgo binaries.
@@ -623,7 +623,7 @@ func sighandler(sig uint32, info *siginfo, ctxt unsafe.Pointer, gp *g) {
                return
        }
 
-       if GOOS == "linux" && sig == sigPerThreadSyscall {
+       if (GOOS == "linux" || GOOS == "android") && sig == sigPerThreadSyscall {
                // sigPerThreadSyscall is the same signal used by glibc for
                // per-thread syscalls on Linux. We use it for the same purpose
                // in non-cgo binaries. Since this signal is not _SigNotify,