runtime: use netbsd signal ABI v2

Use version 2 of the NetBSD signal ABI - both version 2 and version 3
are supported by the kernel, with near identical behaviour. However,
the netbsd32 compat code does not allow version 3 to be used, which
prevents Go netbsd/386 binaries from running in compat mode on a
NetBSD amd64 kernel. Switch to version 2 of the ABI, which is the
same version currently used by NetBSD's libc.

R=minux.ma
CC=golang-dev
https://golang.org/cl/6476068

diff --git a/src/pkg/runtime/sys_netbsd_386.s b/src/pkg/runtime/sys_netbsd_386.s
index 8b5d201e6b10293995296098e21e734fc275c836..75a38f820edae97656402d312b020646118da943 100644 (file)
--- a/src/pkg/runtime/sys_netbsd_386.s
+++ b/src/pkg/runtime/sys_netbsd_386.s
@@ -164,7 +164,7 @@ TEXT runtime·sigaction(SB),7,$24
        MOVSL                           // arg 3 - oact
        LEAL    runtime·sigreturn_tramp(SB), AX
        STOSL                           // arg 4 - tramp
-       MOVL    $3, AX
+       MOVL    $2, AX
        STOSL                           // arg 5 - vers
        MOVL    $340, AX                // sys___sigaction_sigtramp
        INT     $0x80

diff --git a/src/pkg/runtime/sys_netbsd_amd64.s b/src/pkg/runtime/sys_netbsd_amd64.s
index b13800c47e4d3a5cdece6cc911699ec06d20fac3..f5feb48418f0aa4719a189d77b4dcdce0c06ef64 100644 (file)
--- a/src/pkg/runtime/sys_netbsd_amd64.s
+++ b/src/pkg/runtime/sys_netbsd_amd64.s
@@ -183,7 +183,7 @@ TEXT runtime·sigaction(SB),7,$-8
        MOVQ    24(SP), DX              // arg 3 - osa
                                        // arg 4 - tramp
        LEAQ    runtime·sigreturn_tramp(SB), R10
-       MOVQ    $3, R8                  // arg 5 - version
+       MOVQ    $2, R8                  // arg 5 - vers
        MOVL    $340, AX                // sys___sigaction_sigtramp
        SYSCALL
        JCC     2(PC)