X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=urcu%2Fuatomic_arch_sparc64.h;h=622fe100e8f47627b3232acd67dbe5e27bef2e80;hb=0cdbb97c1452c0413c99db75b9841fe3b6243618;hp=87deacd1a064366bceb799cf8620485c06ba6206;hpb=58de5a4bc81e0b64f4fbd46973b5c8b0cd06cda6;p=urcu.git

diff --git a/urcu/uatomic_arch_sparc64.h b/urcu/uatomic_arch_sparc64.h
index 87deacd..622fe10 100644
--- a/urcu/uatomic_arch_sparc64.h
+++ b/urcu/uatomic_arch_sparc64.h
@@ -24,7 +24,7 @@
 #include <urcu/system.h>
 
 #ifndef __SIZEOF_LONG__
-#if (defined(__sparc_v8__) || defined(__sparc_v9__))
+#ifdef __LP64__
 #define __SIZEOF_LONG__ 8
 #else
 #define __SIZEOF_LONG__ 4
@@ -90,9 +90,9 @@ unsigned long _uatomic_exchange(void *addr, unsigned long val, int len)
 	switch (len) {
 	case 4:
 	{
-		unsigned int old;
+		unsigned int old, oldt;
 
-		oldt = uatomic_read(addr);
+		oldt = uatomic_read((unsigned int *)addr);
 		do {
 			old = oldt;
 			oldt = _uatomic_cmpxchg(addr, old, val, 4);
@@ -103,9 +103,9 @@ unsigned long _uatomic_exchange(void *addr, unsigned long val, int len)
 #if (BITS_PER_LONG == 64)
 	case 8:
 	{
-		unsigned long old;
+		unsigned long old, oldt;
 
-		oldt = uatomic_read(addr);
+		oldt = uatomic_read((unsigned long *)addr);
 		do {
 			old = oldt;
 			oldt = _uatomic_cmpxchg(addr, old, val, 8);
@@ -126,15 +126,14 @@ unsigned long _uatomic_exchange(void *addr, unsigned long val, int len)
 /* uatomic_add_return */
 
 static inline __attribute__((always_inline))
-unsigned long _uatomic_add_return(void *addr, unsigned long val,
-				 int len)
+unsigned long _uatomic_add_return(void *addr, unsigned long val, int len)
 {
 	switch (len) {
 	case 4:
 	{
-		unsigned int old;
+		unsigned int old, oldt;
 
-		oldt = uatomic_read(addr);
+		oldt = uatomic_read((unsigned int *)addr);
 		do {
 			old = oldt;
 			oldt = _uatomic_cmpxchg(addr, old, old + val, 4);
@@ -145,9 +144,9 @@ unsigned long _uatomic_add_return(void *addr, unsigned long val,
 #if (BITS_PER_LONG == 64)
 	case 8:
 	{
-		unsigned long old;
+		unsigned long old, oldt;
 
-		oldt = uatomic_read(addr);
+		oldt = uatomic_read((unsigned long *)addr);
 		do {
 			old = oldt;
 			oldt = _uatomic_cmpxchg(addr, old, old + val, 8);
@@ -176,7 +175,6 @@ unsigned long _uatomic_add_return(void *addr, unsigned long val,
 #define uatomic_inc(addr)		uatomic_add((addr), 1)
 #define uatomic_dec(addr)		uatomic_add((addr), -1)
 
-#define URCU_CAS_AVAIL()	1
 #define compat_uatomic_cmpxchg(ptr, old, _new)	uatomic_cmpxchg(ptr, old, _new)
 
 #endif /* _URCU_ARCH_UATOMIC_PPC_H */