rpms/glibc
6
0
Fork 2
Code Issues Pull Requests Releases Activity

Downstream ABI adjustment for pthread_cond_t (RHEL-82285)

Browse Source 
Resolves: RHEL-82285
This commit is contained in:
Florian Weimer 2025-07-01 14:20:48 +02:00
parent 70ebc1f0c6
commit 8e16d819de
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
glibc-RHEL-82285.patch Normal file
View File

@ -0,0 +1,44 @@
External ABI adjustment for pthread_cond_t. This downstream-only
patch is necessary because upstream unfortunately changed the
definition of pthread_cond_t on release branches. The definition
of pthread_cond_t is semi-opaque, but ABI analysis tooling does
not know that. Changing the definition results in incorrect
ABI change errors if application uses pthread_cond_t at any
ABI boundary.
This patch reverts the installed header changes in
glibc-upstream-2.39-188.patch and glibc-upstream-2.39-193.patch.
Furthermore, use __glibc_unused___g_refs to match RHEL 9.
diff --git a/sysdeps/nptl/bits/thread-shared-types.h b/sysdeps/nptl/bits/thread-shared-types.h
index bccc2003ec6dea5c..1d325f58883db08d 100644
--- a/sysdeps/nptl/bits/thread-shared-types.h
+++ b/sysdeps/nptl/bits/thread-shared-types.h
@@ -95,12 +95,11 @@ struct __pthread_cond_s
{
__atomic_wide_counter __wseq;
__atomic_wide_counter __g1_start;
- unsigned int __g_size[2] __LOCK_ALIGNMENT;
+ unsigned int __glibc_unused___g_refs[2] __LOCK_ALIGNMENT;
+ unsigned int __g_size[2];
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 e0f24418fe4233f0..3d4f4a756c66750d 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}, 0, 0 } }
+#define PTHREAD_COND_INITIALIZER { { {0}, {0}, {0, 0}, {0, 0}, 0, 0, {0, 0} } }
/* Cleanup buffers */

6
glibc.spec
View File

@ -145,7 +145,7 @@ Version: %{glibcversion}
# - It allows using the Release number without the %%dist tag in the dependency # - It allows using the Release number without the %%dist tag in the dependency
# generator to make the generated requires interchangeable between Rawhide # generator to make the generated requires interchangeable between Rawhide
# and ELN (.elnYY < .fcXX). # and ELN (.elnYY < .fcXX).
%global baserelease 40 %global baserelease 41
Release: %{baserelease}%{?dist} Release: %{baserelease}%{?dist}
# Licenses: # Licenses:
@ -573,6 +573,7 @@ Patch255: glibc-upstream-2.39-208.patch
Patch256: glibc-upstream-2.39-209.patch Patch256: glibc-upstream-2.39-209.patch
Patch257: glibc-upstream-2.39-210.patch Patch257: glibc-upstream-2.39-210.patch
Patch258: glibc-upstream-2.39-211.patch Patch258: glibc-upstream-2.39-211.patch
Patch259: glibc-RHEL-82285.patch
############################################################################## ##############################################################################
# Continued list of core "glibc" package information: # Continued list of core "glibc" package information:
@ -2570,6 +2571,9 @@ update_gconv_modules_cache ()
%endif %endif
%changelog %changelog
* Tue Jul 01 2025 Florian Weimer <fweimer@redhat.com> - 2.39-41
- Downstream ABI adjustment for pthread_cond_t (RHEL-82285)
* Tue Jun 17 2025 Arjun Shankar <arjun@redhat.com> - 2.39-40 * Tue Jun 17 2025 Arjun Shankar <arjun@redhat.com> - 2.39-40
- Sync with upstream branch release/2.39/master (RHEL-87416) - Sync with upstream branch release/2.39/master (RHEL-87416)
- Upstream commit: cff1042cceec3502269947e96cf7023451af22f3 - Upstream commit: cff1042cceec3502269947e96cf7023451af22f3