From 70ee9b4a07d356e9187dd23683ed2254c91984cd Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Wed, 29 Nov 2017 06:36:42 +0000 Subject: [PATCH] runtime: fix sysctl calling convention on netbsd/386 Thanks to coypoop for noticing at: https://github.com/golang/go/issues/22914#issuecomment-347761838 FreeBSD/386 and NetBSD/386 diverged between Go 1.4 and Go 1.5 when Russ sent https://golang.org/cl/135830043 (git rev 25f6b02ab0db8e) to change the calling convention of the C compilers to match Go. But netbsd wasn't updated. Tested on a NetBSD/386 VM, since the builders aren't back up yet (due to this bug) Fixes #22914 Updates #19339 Updates #20852 Updates #16511 Change-Id: Id76ebe8f29bcc85e39b1c11090639d906cd6cf04 Reviewed-on: https://go-review.googlesource.com/80515 Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot Reviewed-by: Benny Siegert Reviewed-by: Ian Lance Taylor --- src/runtime/sys_netbsd_386.s | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/runtime/sys_netbsd_386.s b/src/runtime/sys_netbsd_386.s index af8c3aa485..8ee7b96ce7 100644 --- a/src/runtime/sys_netbsd_386.s +++ b/src/runtime/sys_netbsd_386.s @@ -375,10 +375,12 @@ TEXT runtime·sysctl(SB),NOSPLIT,$28 MOVSL // arg 6 - newlen MOVL $202, AX // sys___sysctl INT $0x80 - JCC 3(PC) + JAE 4(PC) NEGL AX + MOVL AX, ret+24(FP) RET MOVL $0, AX + MOVL AX, ret+24(FP) RET GLOBL runtime·tlsoffset(SB),NOPTR,$4