diff options
| author | Russ Cox <rsc@golang.org> | 2014-11-16 16:53:53 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-11-16 16:53:53 -0500 |
| commit | fb002ba0ea389cd183fbee72a2a34fbbd6a89279 (patch) | |
| tree | ce93ce3968180fd76a47a084bc0219cd8b233841 /src/runtime/asm_power64x.s | |
| parent | 5012c68de6a62a5adb006f2820a4435c9c349efc (diff) | |
| parent | 8b46a22b652d6e7a4a69b9523d57aff12f9dc945 (diff) | |
| download | go-fb002ba0ea389cd183fbee72a2a34fbbd6a89279.tar.gz | |
[dev.garbage] all: merge dev.cc (723ca3789b88) into dev.garbage
Brings in Linux time signature fixes. Should fix build.
TBR=austin
CC=golang-codereviews
https://codereview.appspot.com/176870043
Diffstat (limited to 'src/runtime/asm_power64x.s')
| -rw-r--r-- | src/runtime/asm_power64x.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/runtime/asm_power64x.s b/src/runtime/asm_power64x.s index a75bb8ce1..ba900c2b3 100644 --- a/src/runtime/asm_power64x.s +++ b/src/runtime/asm_power64x.s @@ -472,7 +472,7 @@ TEXT runtime·atomicstoreuintptr(SB), NOSPLIT, $0-16 // return 1; // } else // return 0; -TEXT runtime·casp(SB), NOSPLIT, $0-25 +TEXT runtime·casp1(SB), NOSPLIT, $0-25 BR runtime·cas64(SB) // uint32 xadd(uint32 volatile *ptr, int32 delta) @@ -529,7 +529,7 @@ TEXT runtime·xchg64(SB), NOSPLIT, $0-24 MOVD R3, ret+16(FP) RETURN -TEXT runtime·xchgp(SB), NOSPLIT, $0-24 +TEXT runtime·xchgp1(SB), NOSPLIT, $0-24 BR runtime·xchg64(SB) TEXT runtime·xchguintptr(SB), NOSPLIT, $0-24 @@ -538,7 +538,7 @@ TEXT runtime·xchguintptr(SB), NOSPLIT, $0-24 TEXT runtime·procyield(SB),NOSPLIT,$0-0 RETURN -TEXT runtime·atomicstorep(SB), NOSPLIT, $0-16 +TEXT runtime·atomicstorep1(SB), NOSPLIT, $0-16 BR runtime·atomicstore64(SB) TEXT runtime·atomicstore(SB), NOSPLIT, $0-12 |