mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 14:43:52 +02:00
46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
From 98c712855d6606d078aaabaa7ef24b695c3f0349 Mon Sep 17 00:00:00 2001
|
|
From: Florian Weimer <fweimer@redhat.com>
|
|
Date: Thu, 13 Mar 2025 06:07:07 +0100
|
|
Subject: [PATCH] nptl: PTHREAD_COND_INITIALIZER compatibility with pre-2.41
|
|
versions (bug 32786)
|
|
|
|
The new initializer and struct layout does not initialize the
|
|
__g_signals field in the old struct layout before the change in
|
|
commit c36fc50781995e6758cae2b6927839d0157f213c ("nptl: Remove
|
|
g_refs from condition variables"). Bring back fields at the end
|
|
of struct __pthread_cond_s, so that they are again zero-initialized.
|
|
|
|
Reviewed-by: Sam James <sam@gentoo.org>
|
|
(cherry picked from commit dbc5a50d12eff4cb3f782129029d04b8a76f58e7)
|
|
---
|
|
NEWS | 1 +
|
|
sysdeps/nptl/bits/thread-shared-types.h | 2 ++
|
|
sysdeps/nptl/pthread.h | 2 +-
|
|
3 files changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/sysdeps/nptl/bits/thread-shared-types.h b/sysdeps/nptl/bits/thread-shared-types.h
|
|
index 7c24c0a6be..e614c7f3c9 100644
|
|
--- a/sysdeps/nptl/bits/thread-shared-types.h
|
|
+++ b/sysdeps/nptl/bits/thread-shared-types.h
|
|
@@ -99,6 +99,8 @@ struct __pthread_cond_s
|
|
unsigned int __g1_orig_size;
|
|
unsigned int __wrefs;
|
|
unsigned int __g_signals[2];
|
|
+ unsigned int __unused_initialized_1;
|
|
+ unsigned int __unused_initialized_2;
|
|
};
|
|
|
|
typedef unsigned int __tss_t;
|
|
diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h
|
|
index 050b4ab8d1..9ad36cabe9 100644
|
|
--- a/sysdeps/nptl/pthread.h
|
|
+++ b/sysdeps/nptl/pthread.h
|
|
@@ -152,7 +152,7 @@ enum
|
|
|
|
|
|
/* Conditional variable handling. */
|
|
-#define PTHREAD_COND_INITIALIZER { { {0}, {0}, {0, 0}, 0, 0, {0, 0} } }
|
|
+#define PTHREAD_COND_INITIALIZER { { {0}, {0}, {0, 0}, 0, 0, {0, 0}, 0, 0 } }
|
|
|
|
|
|
/* Cleanup buffers */
|