Skip to content

Commit ea75b94

Browse files
committed
runtime: use explicit NOFRAME on plan9/amd64
This CL marks some plan9 assembly functions as NOFRAME to avoid relying on the implicit amd64 NOFRAME heuristic, where NOSPLIT functions without stack were also marked as NOFRAME. Updates #58378 Change-Id: Ic8c9ab5c1a0897bebc6c1419ddc903a7492a1b0a Reviewed-on: https://go-review.googlesource.com/c/go/+/466457 TryBot-Bypass: Quim Muntal <[email protected]> Reviewed-by: Keith Randall <[email protected]> Reviewed-by: Cherry Mui <[email protected]>
1 parent a4b66b1 commit ea75b94

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/cmd/internal/obj/x86/obj6.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ func preprocess(ctxt *obj.Link, cursym *obj.LSym, newprog obj.ProgAlloc) {
617617
var usefpheuristic bool
618618
switch ctxt.Headtype {
619619
case objabi.Hwindows, objabi.Hdarwin, objabi.Hlinux, objabi.Hdragonfly,
620-
objabi.Hfreebsd, objabi.Hnetbsd, objabi.Hopenbsd, objabi.Hsolaris:
620+
objabi.Hfreebsd, objabi.Hnetbsd, objabi.Hopenbsd, objabi.Hsolaris, objabi.Hplan9:
621621
default:
622622
usefpheuristic = true
623623
}

src/runtime/sys_plan9_amd64.s

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ TEXT runtime·settls(SB),NOSPLIT,$0
166166
RET
167167

168168
// void sigtramp(void *ureg, int8 *note)
169-
TEXT runtime·sigtramp(SB),NOSPLIT,$0
169+
TEXT runtime·sigtramp(SB),NOSPLIT|NOFRAME,$0
170170
get_tls(AX)
171171

172172
// check that g exists

0 commit comments

Comments
 (0)