From: Michael Hudson-Doyle Date: Wed, 25 Nov 2015 01:27:26 +0000 (+1300) Subject: runtime: fix conflict resolution in golang.org/cl/14207 X-Git-Tag: go1.6beta1~302 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=fd2bc8681d10d3ca98647f4911e498d4e341ab65;p=gostls13.git 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 --- diff --git a/src/runtime/asm_arm64.s b/src/runtime/asm_arm64.s index 8931daa2cd..732abe13af 100644 --- 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 1ecdf3b2cd..f3b193ae31 100644 --- 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