runtime: Fix netbsd/arm and freebsd/arm build

        The ARM external linking CL left missed changes to sys_freebsd_arm.s and sys_netbsd_arm.s already done to sys_linux_arm.s.

R=rsc
CC=golang-dev
https://golang.org/cl/12842044

diff --git a/src/pkg/runtime/sys_freebsd_arm.s b/src/pkg/runtime/sys_freebsd_arm.s
index 1146af64efa6c4c848ebc7b6e44253cb78a108c1..5d3101209252c3b892812d4415a1fbdd06de1611 100644 (file)
--- a/src/pkg/runtime/sys_freebsd_arm.s
+++ b/src/pkg/runtime/sys_freebsd_arm.s
@@ -152,11 +152,11 @@ TEXT runtime·sigaction(SB),NOSPLIT,$-8
 TEXT runtime·sigtramp(SB),NOSPLIT,$24
        // this might be called in external code context,
        // where g and m are not set.
-       // first save R0, because _cgo_load_gm will clobber it
+       // first save R0, because runtime·load_gm will clobber it
        MOVW    R0, 4(R13) // signum
-       MOVW    _cgo_load_gm(SB), R0
+       MOVB    runtime·iscgo(SB), R0
        CMP     $0, R0
-       BL.NE   (R0)
+       BL.NE   runtime·load_gm(SB)
 
        CMP $0, m
        BNE 4(PC)

diff --git a/src/pkg/runtime/sys_netbsd_arm.s b/src/pkg/runtime/sys_netbsd_arm.s
index b660072102dd9b1b12136cc33ffac7f2344aab0a..4a5b88996616b5d633b309eca42afc670547fae7 100644 (file)
--- a/src/pkg/runtime/sys_netbsd_arm.s
+++ b/src/pkg/runtime/sys_netbsd_arm.s
@@ -201,11 +201,11 @@ TEXT runtime·sigaction(SB),NOSPLIT,$4
 TEXT runtime·sigtramp(SB),NOSPLIT,$24
        // this might be called in external code context,
        // where g and m are not set.
-       // first save R0, because _cgo_load_gm will clobber it
+       // first save R0, because runtime·load_gm will clobber it
        MOVW    R0, 4(R13) // signum
-       MOVW    _cgo_load_gm(SB), R0
+       MOVB    runtime·iscgo(SB), R0
        CMP     $0, R0
-       BL.NE   (R0)
+       BL.NE   runtime·load_gm(SB)
 
        CMP $0, m
        BNE 4(PC)