fce39a8d7f
sync with gnulib, fixes compilation with gcc15 Signed-off-by: Ivan Pavlov <AuthorReflex@gmail.com> Link: https://github.com/openwrt/openwrt/pull/22225 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From bdd92b59fe63553712fba57cc64cf8fe6e3e824a Mon Sep 17 00:00:00 2001
|
|
From: Christian Marangi <ansuelsmth@gmail.com>
|
|
Date: Tue, 25 Nov 2025 13:25:28 +0100
|
|
Subject: [PATCH] tests: pthread-rwlock: better support MUSL
|
|
|
|
MUSL doesn't provide PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP as
|
|
it's only glibc and as the MACRO say, it's NP (not portable).
|
|
|
|
Check for the presence of it and disable overwriting the function
|
|
accordingly.
|
|
|
|
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
|
---
|
|
tests/pthread-rwlock.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/tests/pthread-rwlock.c
|
|
+++ b/tests/pthread-rwlock.c
|
|
@@ -49,7 +49,7 @@ pthread_rwlockattr_destroy (_GL_UNUSED p
|
|
return 0;
|
|
}
|
|
|
|
-#elif PTHREAD_RWLOCK_BAD_WAITQUEUE
|
|
+#elif PTHREAD_RWLOCK_BAD_WAITQUEUE && defined PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP
|
|
|
|
/* Override pthread_rwlockattr_init, to use the kind PREFER_WRITER_NONRECURSIVE
|
|
(or possibly PREFER_WRITER) instead of the kind DEFAULT. */
|
|
@@ -398,7 +398,7 @@ pthread_rwlock_destroy (pthread_rwlock_t
|
|
|
|
# else
|
|
|
|
-# if PTHREAD_RWLOCK_BAD_WAITQUEUE
|
|
+# if PTHREAD_RWLOCK_BAD_WAITQUEUE && defined PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP
|
|
|
|
/* Override pthread_rwlock_init, to use the kind PREFER_WRITER_NONRECURSIVE
|
|
(or possibly PREFER_WRITER) instead of the default, when no
|