mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

runtime: define emptyfunc as static function in assembly for freebsd/arm64 

CL 198544 broke the linux/arm64 build because it declares emptyfunc for
GOARCH=arm64, but only freebsd/arm64 defines it. Make it a static
assembly function specific for freebsd/arm64 and remove the stub.

Fixes #35160

Change-Id: I5fd94249b60c6fd259c251407b6eccc8fa512934
Reviewed-on: https://go-review.googlesource.com/c/go/+/203418
Reviewed-by: Bryan C. Mills <bcmills@google.com>
This commit is contained in:
Tobias Klauser 2019-10-25 20:48:07 +02:00 committed by Brad Fitzpatrick
parent 8bb47a5eec
commit 316fb95f4f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/runtime/stubs_arm64.go
View File

@ -7,4 +7,3 @@ package runtime
// Called from assembly only; declared for go vet.
func load_g()
func save_g()
func emptyfunc()

4
src/runtime/sys_freebsd_arm64.s
View File

@ -48,7 +48,7 @@
#define SYS_cpuset_getaffinity 487
#define SYS_pipe2 542
TEXT runtime·emptyfunc(SB),0,$0-0
TEXT emptyfunc<>(SB),0,$0-0
RET
// func sys_umtx_op(addr *uint32, mode int32, val uint32, uaddr1 uintptr, ut *umtx_time) int32
@ -77,7 +77,7 @@ TEXT runtime·thr_start(SB),NOSPLIT,$0
// set up g
MOVD m_g0(R0), g
MOVD R0, g_m(g)
BL runtime·emptyfunc(SB) // fault if stack check is wrong
BL emptyfunc<>(SB) // fault if stack check is wrong
BL runtime·mstart(SB)
MOVD $2, R8 // crash (not reached)