Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Fixes testshared on arm64 and ppc64le.

Change-Id: Ie94bc0c85c7666fbb5ab6fc6d3dbb180407a9955
Reviewed-on: https://go-review.googlesource.com/17212
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Michael Hudson-Doyle 2015-11-25 14:27:26 +13:00
parent 3583a44ed2
commit fd2bc8681d
2 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/runtime/asm_arm64.s
View file

@ -996,6 +996,7 @@ TEXT runtime·addmoduledata(SB),NOSPLIT,$0-0
MOVD R0, runtime·lastmoduledatap(SB) MOVD R0, runtime·lastmoduledatap(SB)
MOVD 8(RSP), R27 MOVD 8(RSP), R27
ADD $0x10, RSP ADD $0x10, RSP
RET
TEXT ·checkASM(SB),NOSPLIT,$0-1 TEXT ·checkASM(SB),NOSPLIT,$0-1
MOVW $1, R3 MOVW $1, R3

1
src/runtime/asm_ppc64x.s
View file

@ -1079,6 +1079,7 @@ TEXT runtime·addmoduledata(SB),NOSPLIT|NOFRAME,$0-0
MOVD R3, runtime·lastmoduledatap(SB) MOVD R3, runtime·lastmoduledatap(SB)
MOVD 0(R1), R31 MOVD 0(R1), R31
ADD $8, R1 ADD $8, R1
RET
TEXT ·checkASM(SB),NOSPLIT,$0-1 TEXT ·checkASM(SB),NOSPLIT,$0-1
MOVW $1, R3 MOVW $1, R3