runtime: fix conflict resolution in golang.org/cl/14207

Fixes testshared on arm64 and ppc64le.

Change-Id: Ie94bc0c85c7666fbb5ab6fc6d3dbb180407a9955
Reviewed-on: https://go-review.googlesource.com/17212
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/runtime/asm_arm64.s b/src/runtime/asm_arm64.s
index 8931daa2cdd5b43b92e86bd412148b9b295433d4..732abe13af1829d2ccb18dd4aa891da56127eee9 100644 (file)
--- a/src/runtime/asm_arm64.s
+++ b/src/runtime/asm_arm64.s
@@ -996,6 +996,7 @@ TEXT runtime·addmoduledata(SB),NOSPLIT,$0-0
        MOVD    R0, runtime·lastmoduledatap(SB)
        MOVD    8(RSP), R27
        ADD     $0x10, RSP
+       RET
 
 TEXT ·checkASM(SB),NOSPLIT,$0-1
        MOVW    $1, R3

diff --git a/src/runtime/asm_ppc64x.s b/src/runtime/asm_ppc64x.s
index 1ecdf3b2cdbf902df8e1741b1b66647fb3d99736..f3b193ae314b1f6804cb5fa92243febc424abe87 100644 (file)
--- a/src/runtime/asm_ppc64x.s
+++ b/src/runtime/asm_ppc64x.s
@@ -1079,6 +1079,7 @@ TEXT runtime·addmoduledata(SB),NOSPLIT|NOFRAME,$0-0
        MOVD    R3, runtime·lastmoduledatap(SB)
        MOVD    0(R1), R31
        ADD     $8, R1
+       RET
 
 TEXT ·checkASM(SB),NOSPLIT,$0-1
        MOVW    $1, R3