diff --git a/devel/userspace-rcu/Makefile b/devel/userspace-rcu/Makefile index 560745148a0e..0b72bd10a658 100644 --- a/devel/userspace-rcu/Makefile +++ b/devel/userspace-rcu/Makefile @@ -1,7 +1,7 @@ # $NetBSD: Makefile,v 1.13 2020/04/29 19:44:49 maya Exp $ # -DISTNAME= userspace-rcu-0.8.7 +DISTNAME= userspace-rcu-0.12.1 CATEGORIES= devel MASTER_SITES= http://lttng.org/files/urcu/ EXTRACT_SUFX= .tar.bz2 diff --git a/devel/userspace-rcu/buildlink3.mk b/devel/userspace-rcu/buildlink3.mk index a09d12469fb4..007688623447 100644 --- a/devel/userspace-rcu/buildlink3.mk +++ b/devel/userspace-rcu/buildlink3.mk @@ -5,7 +5,7 @@ BUILDLINK_TREE+= userspace-rcu .if !defined(USERSPACE_RCU_BUILDLINK3_MK) USERSPACE_RCU_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.userspace-rcu+= userspace-rcu>=0.7.3 +BUILDLINK_API_DEPENDS.userspace-rcu+= userspace-rcu>=0.12.1 BUILDLINK_PKGSRCDIR.userspace-rcu?= ../../devel/userspace-rcu .endif # USERSPACE_RCU_BUILDLINK3_MK diff --git a/devel/userspace-rcu/distinfo b/devel/userspace-rcu/distinfo index 547d79236449..a9c227ee40e4 100644 --- a/devel/userspace-rcu/distinfo +++ b/devel/userspace-rcu/distinfo @@ -1,7 +1,6 @@ $NetBSD: distinfo,v 1.11 2015/11/03 03:29:38 agc Exp $ -SHA1 (userspace-rcu-0.8.7.tar.bz2) = 5306999b8a3296f3dea91246d92e0a993d732898 -RMD160 (userspace-rcu-0.8.7.tar.bz2) = 284d80e80787cb6c91696984813031a810a61bd8 -SHA512 (userspace-rcu-0.8.7.tar.bz2) = 5c75d400de3295cf493b43393e1d5742e41a6a5c5af003c3852a70caa248d4bf2930bba3917ddd02a7c1c702ffe0bce4a5105f8ab8ec3113936a231eb59e7ab1 -Size (userspace-rcu-0.8.7.tar.bz2) = 425072 bytes -SHA1 (patch-urcu_uatomic_generic.h) = 6492e58d704805b29e9dce119c76ebdf615adddc +SHA1 (userspace-rcu-0.12.1.tar.bz2) = 93ad363e3889e55fac7d35d406927e5925e40dd9 +RMD160 (userspace-rcu-0.12.1.tar.bz2) = c55faf01ed8cb2f222d8ec407b2bac91ef66ab7c +SHA512 (userspace-rcu-0.12.1.tar.bz2) = c0c14eede77358904dfb10774390fd86b4fa9e0ab25d278c869728d40eb263bfa7e489b20ce7198169e71d74fe41bb5018fc1553a5e0654840c9765e088c83db +Size (userspace-rcu-0.12.1.tar.bz2) = 527626 bytes diff --git a/devel/userspace-rcu/patches/patch-urcu_uatomic_generic.h b/devel/userspace-rcu/patches/patch-urcu_uatomic_generic.h deleted file mode 100644 index cb517a3c668b..000000000000 --- a/devel/userspace-rcu/patches/patch-urcu_uatomic_generic.h +++ /dev/null @@ -1,100 +0,0 @@ -$NetBSD: patch-urcu_uatomic_generic.h,v 1.1 2015/03/19 19:14:26 joerg Exp $ - -Clang requires correctly sized pointer arguments for the builtins. - ---- urcu/uatomic/generic.h.orig 2015-03-17 21:09:40.000000000 +0000 -+++ urcu/uatomic/generic.h -@@ -65,17 +65,17 @@ unsigned long _uatomic_cmpxchg(void *add - 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 @@ void _uatomic_and(void *addr, unsigned l - 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 @@ void _uatomic_or(void *addr, unsigned lo - 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 @@ unsigned long _uatomic_add_return(void * - 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();