runtime: fix build for ARM

Change-Id: Ia18b8411bebc47ea71ac1acd9ff9dc570ec15dea
Reviewed-on: https://go-review.googlesource.com/2341
Reviewed-by: Dave Cheney <dave@cheney.net>

diff --git a/src/runtime/asm_arm.s b/src/runtime/asm_arm.s
index 3253942c6053f69aa9c5850b75a5b5cf8059e769..d37eed034e5f4a8c9d99a6f2f3f578fd0e2f7a31 100644 (file)
--- a/src/runtime/asm_arm.s
+++ b/src/runtime/asm_arm.s
@@ -394,7 +394,7 @@ TEXT NAME(SB), WRAPPER, $MAXSIZE-20;                \
        ADD     R3, R1;                         \
        ADD     R3, R0;                         \
        SUB     R3, R2;                         \
-loop:
+loop:                                          \
        CMP     $0, R2;                         \
        B.EQ    end;                            \
        MOVBU.P 1(R1), R5;                      \

diff --git a/src/runtime/atomic_arm.go b/src/runtime/atomic_arm.go
index 7f0b929143a7d011186eae912d4b0e02d8dede5a..ff7314462620a6bce2ede277f0f83e9ebfa855bb 100644 (file)
--- a/src/runtime/atomic_arm.go
+++ b/src/runtime/atomic_arm.go
@@ -38,10 +38,10 @@ func xchg(addr *uint32, v uint32) uint32 {
 }
 
 //go:nosplit
-func xchgp1(addr *unsafe.Pointer, v unsafe.Pointer) unsafe.Pointer {
+func xchgp1(addr unsafe.Pointer, v unsafe.Pointer) unsafe.Pointer {
        for {
-               old := *addr
-               if casp1(addr, old, v) {
+               old := *(*unsafe.Pointer)(addr)
+               if casp1((*unsafe.Pointer)(addr), old, v) {
                        return old
                }
        }