From: Cherry Zhang <cherryyz@google.com>
Date: Sat, 3 Oct 2020 20:18:43 +0000 (-0400)
Subject: runtime/cgo: only build xx_cgo_panicmem on iOS
X-Git-Tag: go1.16beta1~825
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3923460dda205721d9bee2714a7f0dd403082a90;p=gostls13.git

runtime/cgo: only build xx_cgo_panicmem on iOS

On iOS, when running under lldb, we install xx_cgo_panicmem as
EXC_BAD_ACCESS handler so we can get a proper Go panic for
SIGSEGV. Only build it on iOS.

Updates #38485.

Change-Id: I801c477439e05920a4bb8fdf5eae6f4923ab8274
Reviewed-on: https://go-review.googlesource.com/c/go/+/259440
Trust: Cherry Zhang <cherryyz@google.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
---

diff --git a/src/runtime/cgo/gcc_signal2_darwin_arm64.c b/src/runtime/cgo/gcc_signal2_ios_arm64.c
similarity index 100%
rename from src/runtime/cgo/gcc_signal2_darwin_arm64.c
rename to src/runtime/cgo/gcc_signal2_ios_arm64.c
diff --git a/src/runtime/cgo/gcc_signal_darwin_lldb.c b/src/runtime/cgo/gcc_signal_darwin_nolldb.c
similarity index 93%
rename from src/runtime/cgo/gcc_signal_darwin_lldb.c
rename to src/runtime/cgo/gcc_signal_darwin_nolldb.c
index 0ccdae324e..26be71bd1d 100644
--- a/src/runtime/cgo/gcc_signal_darwin_lldb.c
+++ b/src/runtime/cgo/gcc_signal_darwin_nolldb.c
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !lldb
+// +build !lldb !ios
 // +build darwin
 // +build arm64
 
diff --git a/src/runtime/cgo/gcc_signal_darwin_arm64.c b/src/runtime/cgo/gcc_signal_ios_arm64.c
similarity index 100%
rename from src/runtime/cgo/gcc_signal_darwin_arm64.c
rename to src/runtime/cgo/gcc_signal_ios_arm64.c
diff --git a/src/runtime/cgo/signal_darwin_arm64.go b/src/runtime/cgo/signal_ios_arm64.go
similarity index 100%
rename from src/runtime/cgo/signal_darwin_arm64.go
rename to src/runtime/cgo/signal_ios_arm64.go
diff --git a/src/runtime/cgo/signal_darwin_arm64.s b/src/runtime/cgo/signal_ios_arm64.s
similarity index 100%
rename from src/runtime/cgo/signal_darwin_arm64.s
rename to src/runtime/cgo/signal_ios_arm64.s