From: Andrew Gerrand <adg@golang.org>
Date: Fri, 10 Jun 2011 03:50:19 +0000 (+1000)
Subject: sync/atomic: fix arm check64 bug
X-Git-Tag: weekly.2011-06-09~2
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=d44c4c351d9c3779b407e819fb1d06755492c9ad;p=gostls13.git

sync/atomic: fix arm check64 bug

R=r, rsc
CC=golang-dev
https://golang.org/cl/4571059
---

diff --git a/src/pkg/sync/atomic/asm_arm.s b/src/pkg/sync/atomic/asm_arm.s
index 448a98a010..95e2f5be41 100644
--- a/src/pkg/sync/atomic/asm_arm.s
+++ b/src/pkg/sync/atomic/asm_arm.s
@@ -90,11 +90,11 @@ add64loop:
 TEXT	check64<>(SB),7,$16
 	MOVW	$10, R1
 	// 8-aligned stack address scratch space.
-	MOVW	$8(SP), R3
-	AND	$~7, R3
+	MOVW	$8(R13), R5
+	AND	$~7, R5
 loop:
-	LDREXD	(R3), R2
-	STREXD	R2, (R3), R0
+	LDREXD	(R5), R2
+	STREXD	R2, (R5), R0
 	CMP	$0, R0
 	BEQ	ok
 	SUB	$1, R1