98 lines
2.7 KiB
Diff
98 lines
2.7 KiB
Diff
|
diff -u -r a/usr/include/urcu/uatomic/generic.h b/usr/include/urcu/uatomic/generic.h
|
||
|
|
--- a/usr/include/urcu/uatomic/generic.h 2014-03-28 06:04:42.000000000 +0900
|
||
|
|
+++ b/usr/include/urcu/uatomic/generic.h 2017-02-13 10:35:21.189927116 +0900
|
||
|
|
@@ -65,17 +65,17 @@
|
||
|
|
switch (len) {
|
||
|
|
#ifdef UATOMIC_HAS_ATOMIC_BYTE
|
||
|
|
case 1:
|
||
|
|
- return __sync_val_compare_and_swap_1(addr, old, _new);
|
||
|
|
+ return __sync_val_compare_and_swap_1((uint8_t *) addr, old, _new);
|
||
|
|
#endif
|
||
|
|
#ifdef UATOMIC_HAS_ATOMIC_SHORT
|
||
|
|
case 2:
|
||
|
|
- return __sync_val_compare_and_swap_2(addr, old, _new);
|
||
|
|
+ return __sync_val_compare_and_swap_2((uint16_t *) addr, old, _new);
|
||
|
|
#endif
|
||
|
|
case 4:
|
||
|
|
- return __sync_val_compare_and_swap_4(addr, old, _new);
|
||
|
|
+ return __sync_val_compare_and_swap_4((uint32_t *) addr, old, _new);
|
||
|
|
#if (CAA_BITS_PER_LONG == 64)
|
||
|
|
case 8:
|
||
|
|
- return __sync_val_compare_and_swap_8(addr, old, _new);
|
||
|
|
+ return __sync_val_compare_and_swap_8((uint64_t *) addr, old, _new);
|
||
|
|
#endif
|
||
|
|
}
|
||
|
|
_uatomic_link_error();
|
||
|
|
@@ -100,20 +100,20 @@
|
||
|
|
switch (len) {
|
||
|
|
#ifdef UATOMIC_HAS_ATOMIC_BYTE
|
||
|
|
case 1:
|
||
|
|
- __sync_and_and_fetch_1(addr, val);
|
||
|
|
+ __sync_and_and_fetch_1((uint8_t *) addr, val);
|
||
|
|
return;
|
||
|
|
#endif
|
||
|
|
#ifdef UATOMIC_HAS_ATOMIC_SHORT
|
||
|
|
case 2:
|
||
|
|
- __sync_and_and_fetch_2(addr, val);
|
||
|
|
+ __sync_and_and_fetch_2((uint16_t *) addr, val);
|
||
|
|
return;
|
||
|
|
#endif
|
||
|
|
case 4:
|
||
|
|
- __sync_and_and_fetch_4(addr, val);
|
||
|
|
+ __sync_and_and_fetch_4((uint32_t *) addr, val);
|
||
|
|
return;
|
||
|
|
#if (CAA_BITS_PER_LONG == 64)
|
||
|
|
case 8:
|
||
|
|
- __sync_and_and_fetch_8(addr, val);
|
||
|
|
+ __sync_and_and_fetch_8((uint64_t *) addr, val);
|
||
|
|
return;
|
||
|
|
#endif
|
||
|
|
}
|
||
|
|
@@ -139,20 +139,20 @@
|
||
|
|
switch (len) {
|
||
|
|
#ifdef UATOMIC_HAS_ATOMIC_BYTE
|
||
|
|
case 1:
|
||
|
|
- __sync_or_and_fetch_1(addr, val);
|
||
|
|
+ __sync_or_and_fetch_1((uint8_t *) addr, val);
|
||
|
|
return;
|
||
|
|
#endif
|
||
|
|
#ifdef UATOMIC_HAS_ATOMIC_SHORT
|
||
|
|
case 2:
|
||
|
|
- __sync_or_and_fetch_2(addr, val);
|
||
|
|
+ __sync_or_and_fetch_2((uint16_t *) addr, val);
|
||
|
|
return;
|
||
|
|
#endif
|
||
|
|
case 4:
|
||
|
|
- __sync_or_and_fetch_4(addr, val);
|
||
|
|
+ __sync_or_and_fetch_4((uint32_t *) addr, val);
|
||
|
|
return;
|
||
|
|
#if (CAA_BITS_PER_LONG == 64)
|
||
|
|
case 8:
|
||
|
|
- __sync_or_and_fetch_8(addr, val);
|
||
|
|
+ __sync_or_and_fetch_8((uint64_t *) addr, val);
|
||
|
|
return;
|
||
|
|
#endif
|
||
|
|
}
|
||
|
|
@@ -180,17 +180,17 @@
|
||
|
|
switch (len) {
|
||
|
|
#ifdef UATOMIC_HAS_ATOMIC_BYTE
|
||
|
|
case 1:
|
||
|
|
- return __sync_add_and_fetch_1(addr, val);
|
||
|
|
+ return __sync_add_and_fetch_1((uint8_t *) addr, val);
|
||
|
|
#endif
|
||
|
|
#ifdef UATOMIC_HAS_ATOMIC_SHORT
|
||
|
|
case 2:
|
||
|
|
- return __sync_add_and_fetch_2(addr, val);
|
||
|
|
+ return __sync_add_and_fetch_2((uint16_t *) addr, val);
|
||
|
|
#endif
|
||
|
|
case 4:
|
||
|
|
- return __sync_add_and_fetch_4(addr, val);
|
||
|
|
+ return __sync_add_and_fetch_4((uint32_t *) addr, val);
|
||
|
|
#if (CAA_BITS_PER_LONG == 64)
|
||
|
|
case 8:
|
||
|
|
- return __sync_add_and_fetch_8(addr, val);
|
||
|
|
+ return __sync_add_and_fetch_8((uint64_t *) addr, val);
|
||
|
|
#endif
|
||
|
|
}
|
||
|
|
_uatomic_link_error();
|