From 764a6ac29e4f720a0a33cb5ee02b9108821d8388 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Thu, 12 Oct 2017 18:41:06 +0200 Subject: [PATCH] runtime: don't restore the alternate signal stack on ios The alternative signal stack doesn't work on ios, so the setup of the alternative stack was skipped. The corresponding unminitSignals was effectively a no-op on ios until CL 70130. Skip unminitSignals on ios to restore the previous behaviour. For the ios builders. Change-Id: I5692ca7f5997e6b9d10cc5f2383a5a37c42b133c Reviewed-on: https://go-review.googlesource.com/70270 Run-TryBot: Elias Naur Reviewed-by: Austin Clements --- src/runtime/os_darwin.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/runtime/os_darwin.go b/src/runtime/os_darwin.go index 635f71f126..4ab5a76373 100644 --- a/src/runtime/os_darwin.go +++ b/src/runtime/os_darwin.go @@ -188,7 +188,11 @@ func minit() { // Called from dropm to undo the effect of an minit. //go:nosplit func unminit() { - unminitSignals() + // The alternate signal stack is buggy on arm and arm64. + // See minit. + if GOARCH != "arm" && GOARCH != "arm64" { + unminitSignals() + } } // Mach IPC, to get at semaphores