[gentoo-commits] repo/gentoo:master commit in: dev-libs/userspace-rcu/, dev-libs/userspace-rcu/files/
commit: 779eeb1c7d2bb79bf8c69f5a33cabd7c6f3a7a58
Author: Sam James gentoo org>
AuthorDate: Fri Mar 24 06:59:49 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Mar 24 06:59:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=779eeb1c
dev-libs/userspace-rcu: add 0.14.0
Signed-off-by: Sam James gentoo.org>
dev-libs/userspace-rcu/Manifest| 1 +
.../files/userspace-rcu-0.14.0-c11.patch | 61 ++
.../files/userspace-rcu-0.14.0-noreturn.patch | 51 ++
dev-libs/userspace-rcu/userspace-rcu-0.14.0.ebuild | 58
4 files changed, 171 insertions(+)
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index 2e76cc583702..bb9ddf3d1c66 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -1 +1,2 @@
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
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 ..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?=
+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 header.
+
+Signed-off-by: Ondřej Surý
+Signed-off-by: Mathieu Desnoyers
+--- 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 ..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
+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
[gentoo-commits] repo/gentoo:master commit in: dev-libs/userspace-rcu/, dev-libs/userspace-rcu/files/
commit: 6b75b7fdc950f376e04ff246e6aa583a700e1855
Author: WANG Xuerui gentoo org>
AuthorDate: Mon Apr 25 04:22:54 2022 +
Commit: WANG Xuerui gentoo org>
CommitDate: Thu Apr 28 22:23:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b75b7fd
dev-libs/userspace-rcu: add support for loong
The patch comes from https://github.com/loongarch64/userspace-rcu/pull/2
which is reviewed by the LoongArch community, but not upstreamed yet.
This has been inside loongson-overlay for a while, and is tested on real
loong hardware.
See: https://github.com/gentoo/gentoo/pull/25189
Signed-off-by: WANG Xuerui gentoo.org>
.../files/userspace-rcu-0.13.1-loong.patch | 178 +
dev-libs/userspace-rcu/userspace-rcu-0.13.1.ebuild | 2 +
2 files changed, 180 insertions(+)
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
new file mode 100644
index ..22daddedb61c
--- /dev/null
+++ b/dev-libs/userspace-rcu/files/userspace-rcu-0.13.1-loong.patch
@@ -0,0 +1,178 @@
+This is https://github.com/loongarch64/userspace-rcu/pull/2, yet to be
+upstreamed but already reviewed and accepted by the LoongArch porting
+community.
+From 213197eea1a711da2f7cc0c04cdf33acb1b3c50e Mon Sep 17 00:00:00 2001
+From: Wang Jing
+Date: Tue, 8 Jun 2021 19:44:49 +0800
+Subject: [PATCH] Add LoongArch support
+
+--- a/LICENSE
b/LICENSE
+@@ -44,6 +44,7 @@ MIT/X11 (BSD like) license apply to:
+ compiler.h
+ arch/s390.h
+ uatomic/alpha.h
++uatomic/loongarch.h
+ uatomic/mips.h
+ uatomic/nios2.h
+ uatomic/s390.h
+--- a/README.md
b/README.md
+@@ -51,6 +51,7 @@ Currently, the following architectures are supported:
+ - hppa/PA-RISC
+ - m68k
+ - RISC-V
++ - LoongArch
+
+ Tested on:
+
+--- a/include/Makefile.am
b/include/Makefile.am
+@@ -7,6 +7,7 @@ nobase_include_HEADERS = \
+ urcu/arch.h \
+ urcu/arch/hppa.h \
+ urcu/arch/ia64.h \
++ urcu/arch/loongarch.h \
+ urcu/arch/m68k.h \
+ urcu/arch/mips.h \
+ urcu/arch/nios2.h \
+@@ -67,6 +68,7 @@ nobase_include_HEADERS = \
+ urcu/uatomic.h \
+ urcu/uatomic/hppa.h \
+ urcu/uatomic/ia64.h \
++ urcu/uatomic/loongarch.h \
+ urcu/uatomic/m68k.h \
+ urcu/uatomic/mips.h \
+ urcu/uatomic/nios2.h \
+--- a/include/urcu/arch.h
b/include/urcu/arch.h
+@@ -49,6 +49,7 @@
+ * URCU_ARCH_HPPA : All HP PA-RISC variants
+ * URCU_ARCH_M68K : All Motorola 68000 variants
+ * URCU_ARCH_RISCV : All RISC-V variants
++ * URCU_ARCH_LOONGARCH : All LoongArch variants
+ */
+
+ #if (defined(__INTEL_OFFLOAD) || defined(__TARGET_ARCH_MIC) ||
defined(__MIC__))
+@@ -157,6 +158,11 @@
+ #define URCU_ARCH_RISCV 1
+ #include
+
++#elif defined(__loongarch__)
++
++#define URCU_ARCH_LOONGARCH 1
++#include
++
+ #else
+ #error "Cannot build: unrecognized architecture, see ."
+ #endif
+--- /dev/null
b/include/urcu/arch/loongarch.h
+@@ -0,0 +1,49 @@
++#ifndef _URCU_ARCH_LOONGARCH_H
++#define _URCU_ARCH_LOONGARCH_H
++
++/*
++ * arch/loongarch.h: trivial definitions for the LoongArch architecture.
++ *
++ * Copyright (c) 2021 Wang Jing
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
++ */
++
++#include
++#include
++#include
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#include
++#include
++
++/*
++ * On Linux, define the membarrier system call number if not yet available in
++ * the system headers.
++ */
++#if (defined(__linux__) && !defined(__NR_membarrier))
++#define __NR_membarrier 283
++#endif
++
++#ifdef __cplusplus
++}
++#endif
++
++#include
++
++#endif /* _URCU_ARCH_LOONGARCH_H */
+--- a/include/urcu/uatomic.h
b/include/urcu/uatomic.h
+@@ -51,6 +51,8 @@
+ #include
+ #elif defined(URCU_ARCH_RISCV)
+ #include
++#elif defined(URCU_ARCH_LOONGARCH)
++#include
+ #else
+ #error "Cannot build: unrecognized architecture, see ."
+ #endif
+--- /dev/null
b/include/urcu/uatomic/loongarch.h
+@@ -0,0 +1,44 @@
++#ifndef _URCU_UATOMIC_ARCH_LOONGARCH_H
++#define _URCU_UATOMIC_ARCH_LOONGARCH_H
++
++/*
++ * Atomic exchange operations for the LoongArch architecture. Let GCC do it.
++ *
++ * Copyright (c) 2021 Wang Jing
++ *
++ *
