6 files changed, 178 insertions, 1 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index a9a0104a3845..259be3409a38 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index 2616a2885890..b131d01da0e7 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -1,5 +1,9 @@
-AUX userspace-rcu-0.13.1-loong.patch 5308 BLAKE2B 94ca49f47c68efb8e368033ee77eeeba0484735d7bef2ea15bc1956a9c05c8f5d275f521412aa3bcaeb4221e86240b6d42b04112d8a3565fc4074b84059d460f SHA512 32fc545a8201cc8a8db4d38c4fc3ec93c0717e23a87cd0533be0e60ef47027d8442547cd0cd46e4e99d235efcf8045eb8c106fde1e3389256fd80114b20df5a6
+AUX userspace-rcu-0.13.1-loong.patch 5362 BLAKE2B 461db1293f459b29a144855953ad4fa16554f7086215cbd318c0ee7a83758d1484f88f1e6f64d661d4c56d6a356af52ebddf546bc9eb12e07bac46ddc7d43233 SHA512 86f28616f19021e0a7a8f05cfbf7f744ee44d61787374e6516a3a3bff4d1a15ae334a5ac2fbe2606de22a85227e0c6906436818fbf246095ca04e71bfca6ef88
 AUX userspace-rcu-0.13.1-tests-no-benchmark.patch 441 BLAKE2B 8e5737b349d21ae4cdc87b821027bd500f35921afbc1d506977038a79b14e468ea3dfbf7f2d301e905217b3454641ab81c3eceae7a597dc777967133f66b7c20 SHA512 a1749498e1b038b003502d1c40aa664fea36558f403229bb7c28a0540ef341fc578dcc46985a45a8dcd59c3a7e035efd205c40288d58c0e5866af019b65e0d82
+AUX userspace-rcu-0.14.0-c11.patch 2111 BLAKE2B 1df73e8f788bcabd10c903051cd24dbd7858685c78d780aa35f7fd51ed9b198f762a03d434389161ceb6705a3bcf5a55439af50d3ab4ee4ad162ecd15562c4b0 SHA512 af0858d00393e07ff3bc224f0e9a73afa6de6582ca7a8bb400aa0711392f9a42611ffbf5c79ee4385719ad0a11f61a54ec990eb32011a1fe87cc4d72ea4c2eb8
+AUX userspace-rcu-0.14.0-noreturn.patch 1644 BLAKE2B 6277aa6884b70ff8056e43008c378b40cabfb4b3091659683881c7a9658c743331dcfc1c76e11b9e9e55bd6b9a3693607509c94f8c2c4369d88c30266d8877d7 SHA512 de1fe993b421163ebbbb28a08145031b9388429140f9afbb792e5e12724eef1df51358750b34d162a91ad3ee6e5c8f2bd124fdd2835ab18e757adab4d734185f
 DIST userspace-rcu-0.13.2.tar.bz2 611448 BLAKE2B 6d502e0035b03df262c917ba70f7442e2bd81369091b2c521fe5c32f31ed2ef7404070759f3a8910b767153e05d28e354d5e5ece2a3ba17e4a31dd7db3e1924f SHA512 e5097a7f653f51b3a47a09f79e7a153aab8fd22c0504a1127a9b33d093a9ae6a941b97c0fe175ee168e2976097aefdcdf8d5ce030afbe565c1b72f64d6f5b60a
+DIST userspace-rcu-0.14.0.tar.bz2 661322 BLAKE2B ba9fa4c6dec693d2616234187db531f00fc0ade65f7e2a57182d9441728ddfa6f3e9d4544b824ca5edf7c027a43c9231d998a309c01f4bbab1eeefe856344f77 SHA512 7297e51012f4c44ee27c0e18ed9d87bf24be34db68a5398394c1e683a045bb561cf74aa913398404c0ed5cb8011af728ea12947717fa5f27627e5ca78e63a40f
 EBUILD userspace-rcu-0.13.2.ebuild 1106 BLAKE2B e715d27230f38a2981f7aef2edfcef9291292e6c6eb211dfcc8eee02935f49b001f5560e6a879ff0de203cc5cc30778290a83f228dfbce3d2c5d95af0146ab6a SHA512 eb3fa88ff25378dc8d45001b923aaddb88e7c72ef5ed68edea6059bc7da11baa2f586b8f9fc74df4f44bd15e4573dc62c3605b712d7db7f3142fd0256e9f10d6
+EBUILD userspace-rcu-0.14.0.ebuild 1259 BLAKE2B 798e3f3aa1bdf0f4a394436bca29552d39a0a50711a336cf9dda14ebd2e4f946594dee0b126eb9e8b3654936aef49cc8707589bba9e88ebf75e7436f50207e9a SHA512 131566a88ccccdc4d1357a847876a105c77a3d5d3bb486d058c33fc06564bac5db91157ad4ce6c581761cc20aeb290f26df7f3330fabf46b369316791d705172
 MISC metadata.xml 341 BLAKE2B bc37ed52ea2032c387966023434b69d8b184e7800e8588398350eaa6f55c8895822370ebcf971b8ebc87d112ec3de973929455a78519b4f0f5081a4693be0d8f SHA512 a88f7a9bebe6947cc296e3f0d7b316648cba7117551ee6a9b06c51d5ecd010ebf34918939fffef4dc6156dc818cbd38b72dd394a6acff9b873e8a3fc247e3f02
diff --git a/dev-libs/userspace-rcu/files/userspace-rcu-0.13.1-loong.patch b/dev-libs/userspace-rcu/files/userspace-rcu-0.13.1-loong.patch
index 22daddedb61c..c21d2c02a105 100644
--- a/dev-libs/userspace-rcu/files/userspace-rcu-0.13.1-loong.patch
+++ b/dev-libs/userspace-rcu/files/userspace-rcu-0.13.1-loong.patch
@@ -1,6 +1,9 @@
 This is https://github.com/loongarch64/userspace-rcu/pull/2, yet to be
 upstreamed but already reviewed and accepted by the LoongArch porting
 community.
+
+(and https://github.com/urcu/userspace-rcu/pull/11)
+
 From 213197eea1a711da2f7cc0c04cdf33acb1b3c50e Mon Sep 17 00:00:00 2001
 From: Wang Jing <wangjing@loongson.cn>
 Date: Tue, 8 Jun 2021 19:44:49 +0800
diff --git a/dev-libs/userspace-rcu/files/userspace-rcu-0.14.0-c11.patch b/dev-libs/userspace-rcu/files/userspace-rcu-0.14.0-c11.patch
new file mode 100644
index 000000000000..c931e052c432
--- /dev/null
+++ b/dev-libs/userspace-rcu/files/userspace-rcu-0.14.0-c11.patch
@@ -0,0 +1,61 @@
+https://github.com/urcu/userspace-rcu/commit/6fa8b4f80f1d2efbc90fc6d2a5fb0dc1d7fd2a19
+
+From 6fa8b4f80f1d2efbc90fc6d2a5fb0dc1d7fd2a19 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
+Date: Fri, 17 Mar 2023 16:44:10 +0100
+Subject: [PATCH] Fix: use __noreturn__ for C11-compatibility
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The noreturn convenience macro provided by stdnoreturn.h might get
+included before urcu headers, use __noreturn__ for better compatibility
+with code using <stdnoreturn.h> header.
+
+Signed-off-by: Ondřej Surý <ondrej@sury.org>
+Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+--- a/include/urcu/uatomic/generic.h
++++ b/include/urcu/uatomic/generic.h
+@@ -38,7 +38,7 @@ extern "C" {
+ #endif
+ 
+ #if !defined __OPTIMIZE__  || defined UATOMIC_NO_LINK_ERROR
+-static inline __attribute__((always_inline, noreturn))
++static inline __attribute__((always_inline, __noreturn__))
+ void _uatomic_link_error(void)
+ {
+ #ifdef ILLEGAL_INSTR
+--- a/src/urcu-call-rcu-impl.h
++++ b/src/urcu-call-rcu-impl.h
+@@ -1064,7 +1064,7 @@ void urcu_register_rculfhash_atfork(struct urcu_atfork *atfork)
+  * This unregistration function is deprecated, meant only for internal
+  * use by rculfhash.
+  */
+-__attribute__((noreturn))
++__attribute__((__noreturn__))
+ void urcu_unregister_rculfhash_atfork(struct urcu_atfork *atfork __attribute__((unused)))
+ {
+ 	urcu_die(EPERM);
+--- a/tests/regression/rcutorture.h
++++ b/tests/regression/rcutorture.h
+@@ -572,7 +572,7 @@ int stresstest(int nreaders)
+  */
+ 
+ static
+-void usage(char *argv[]) __attribute__((noreturn));
++void usage(char *argv[]) __attribute__((__noreturn__));
+ 
+ static
+ void usage(char *argv[])
+--- a/tests/utils/tap.h
++++ b/tests/utils/tap.h
+@@ -41,7 +41,7 @@ __attribute__((format(TAP_PRINTF_FORMAT, 5, 6)))
+ unsigned int _gen_result(int, const char *, const char *, unsigned int, const char *, ...);
+ 
+ int plan_no_plan(void);
+-__attribute__((noreturn))
++__attribute__((__noreturn__))
+ int plan_skip_all(const char *);
+ int plan_tests(unsigned int);
+ 
+
diff --git a/dev-libs/userspace-rcu/files/userspace-rcu-0.14.0-noreturn.patch b/dev-libs/userspace-rcu/files/userspace-rcu-0.14.0-noreturn.patch
new file mode 100644
index 000000000000..c8798092f158
--- /dev/null
+++ b/dev-libs/userspace-rcu/files/userspace-rcu-0.14.0-noreturn.patch
@@ -0,0 +1,51 @@
+https://github.com/urcu/userspace-rcu/commit/106ed13754b1b836f4b59405f4e02aea4bf5eef0
+
+From 106ed13754b1b836f4b59405f4e02aea4bf5eef0 Mon Sep 17 00:00:00 2001
+From: Michael Jeanson <mjeanson@efficios.com>
+Date: Thu, 23 Mar 2023 14:23:55 -0400
+Subject: [PATCH] fix: warning 'noreturn' function does return on ppc
+
+On a ppc64 system with gcc 9.5.0 I get the following error when building
+with -O0 :
+
+/usr/include/urcu/uatomic/generic.h: In function 'void _uatomic_link_error()':
+/usr/include/urcu/uatomic/generic.h:53:1: warning: 'noreturn' function does return
+   53 | }
+      | ^
+
+Split the inline function in 2 variants and apply the noreturn attribute
+only on the builtin_trap one.
+
+Change-Id: I5ae8e764c4cc27af0463924a653b9eaa9f698c34
+Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
+Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+--- a/include/urcu/uatomic/generic.h
++++ b/include/urcu/uatomic/generic.h
+@@ -38,19 +38,23 @@ extern "C" {
+ #endif
+ 
+ #if !defined __OPTIMIZE__  || defined UATOMIC_NO_LINK_ERROR
+-static inline __attribute__((always_inline, __noreturn__))
++#ifdef ILLEGAL_INSTR
++static inline __attribute__((always_inline))
+ void _uatomic_link_error(void)
+ {
+-#ifdef ILLEGAL_INSTR
+ 	/*
+ 	 * generate an illegal instruction. Cannot catch this with
+ 	 * linker tricks when optimizations are disabled.
+ 	 */
+ 	__asm__ __volatile__(ILLEGAL_INSTR);
++}
+ #else
++static inline __attribute__((always_inline, __noreturn__))
++void _uatomic_link_error(void)
++{
+ 	__builtin_trap();
+-#endif
+ }
++#endif
+ 
+ #else /* #if !defined __OPTIMIZE__  || defined UATOMIC_NO_LINK_ERROR */
+ extern void _uatomic_link_error(void);
+
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.14.0.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.14.0.ebuild
new file mode 100644
index 000000000000..851b0aa9195e
--- /dev/null
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.14.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Userspace RCU (read-copy-update) library"
+HOMEPAGE="https://liburcu.org/"
+SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0/8" # subslot = soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( sys-process/time )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.13.1-tests-no-benchmark.patch
+	"${FILESDIR}"/${PN}-0.13.1-loong.patch
+	"${FILESDIR}"/${P}-c11.patch
+	"${FILESDIR}"/${P}-noreturn.patch
+)
+
+src_prepare() {
+	default
+
+	# Needed for tests patch
+	# ... and refresh libtool (see https://github.com/gentoo/gentoo/pull/23973)
+	# ... and for build on loong (see https://github.com/gentoo/gentoo/pull/25189)
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	default
+
+	emake -C tests/regression regtest
+
+	# We don't run the benchmark tests.
+	rm tests/benchmark/test-suite.log || die
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}