From: Dmitriy Vyukov <dvyukov@google.com>
Date: Thu, 4 Sep 2014 06:16:57 +0000 (+0400)
Subject: runtime: fix arm build
X-Git-Tag: go1.4beta1~543
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1b47af21995cfbb5f8367b371b37f7c6f8454f5d;p=gostls13.git

runtime: fix arm build

TBR=rsc
R=rsc
CC=golang-codereviews
https://golang.org/cl/140990043
---

diff --git a/src/pkg/runtime/atomic_arm.c b/src/pkg/runtime/atomic_arm.c
index 5369820c09..487b128cbb 100644
--- a/src/pkg/runtime/atomic_arm.c
+++ b/src/pkg/runtime/atomic_arm.c
@@ -58,7 +58,7 @@ runtime·xchgp(void* volatile* addr, void* v)
 void*
 runtime·xchguintptr(void* volatile* addr, void* v)
 {
-	return runtime·xchg((uint32*)addr, (uint32)v);
+	return (void*)runtime·xchg((uint32*)addr, (uint32)v);
 }
 
 #pragma textflag NOSPLIT