diff options
| author | Michael Hudson-Doyle <michael.hudson@canonical.com> | 2015-11-25 14:27:26 +1300 |
|---|---|---|
| committer | Michael Hudson-Doyle <michael.hudson@canonical.com> | 2015-11-25 01:32:55 +0000 |
| commit | fd2bc8681d10d3ca98647f4911e498d4e341ab65 (patch) | |
| tree | 9de3cd18db794dbe474b53545cffe43809317380 /src | |
| parent | 3583a44ed2ae27495626caaa431b197187dcf01b (diff) | |
| download | go-fd2bc8681d10d3ca98647f4911e498d4e341ab65.tar.xz | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/runtime/asm_arm64.s | 1 | ||||
| -rw-r--r-- | src/runtime/asm_ppc64x.s | 1 |
2 files changed, 2 insertions, 0 deletions
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 |