Commit fd2bc868 authored by Michael Hudson-Doyle's avatar Michael Hudson-Doyle

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/17212Reviewed-by: 's avatarBrad Fitzpatrick <bradfitz@golang.org>
parent 3583a44e
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment