packages/glibc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!549 [sync] PR-548: add pthread_cond_clockwait@GLIBC_2_28

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @liqingqing_1229 
Signed-off-by: @liqingqing_1229
This commit is contained in:
openeuler-ci-bot 2023-02-07 02:18:03 +00:00 committed by Gitee
commit ddc745c607
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 72 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
add-pthread_cond_clockwait-GLIBC_2_28.patch Normal file
View File

@ -0,0 +1,66 @@
From e6569a3c53c25916f5c04ccc3d6a467c57d4eab8 Mon Sep 17 00:00:00 2001
From: Yang Yanchao <yangyanchao6@huawei.com>
Date: Thu, 19 Jan 2023 21:40:08 +0800
Subject: [PATCH] add pthread_cond_clockwait@GLIBC_2_28
Since the pthread_cond_clockwait@GLIBC_2_28 is introduced in earlier
versions, this symbol is required to keep the previous items compatible.
---
nptl/Versions | 1 +
nptl/pthread_cond_wait.c | 4 ++++
sysdeps/unix/sysv/linux/aarch64/libc.abilist | 1 +
sysdeps/unix/sysv/linux/x86_64/64/libc.abilist | 1 +
5 files changed, 9 insertions(+)
diff --git a/nptl/Versions b/nptl/Versions
index 3221de89..dc341f9d 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -231,6 +231,7 @@ libc {
tss_delete;
tss_get;
tss_set;
+ pthread_cond_clockwait;
}
GLIBC_2.30 {
pthread_cond_clockwait;
diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c
index dc8c511f..04eeff34 100644
--- a/nptl/pthread_cond_wait.c
+++ b/nptl/pthread_cond_wait.c
@@ -709,3 +709,7 @@ versioned_symbol (libc, ___pthread_cond_clockwait,
compat_symbol (libpthread, ___pthread_cond_clockwait,
pthread_cond_clockwait, GLIBC_2_30);
#endif
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_28, GLIBC_2_34)
+compat_symbol (libpthread, ___pthread_cond_clockwait,
+ pthread_cond_clockwait, GLIBC_2_28);
+#endif
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index a4262419..a0795a80 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -383,6 +383,7 @@ GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
+GLIBC_2.28 pthread_cond_clockwait F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_create F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
index 095e914b..0eaab342 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
@@ -2413,6 +2413,7 @@ GLIBC_2.28 mtx_lock F
GLIBC_2.28 mtx_timedlock F
GLIBC_2.28 mtx_trylock F
GLIBC_2.28 mtx_unlock F
+GLIBC_2.28 pthread_cond_clockwait F
GLIBC_2.28 renameat2 F
GLIBC_2.28 statx F
GLIBC_2.28 thrd_create F
--
2.33.0

7
glibc.spec
View File

@ -66,7 +66,7 @@
############################################################################## ##############################################################################
Name: glibc Name: glibc
Version: 2.34 Version: 2.34
Release: 108 Release: 109
Summary: The GNU libc libraries Summary: The GNU libc libraries
License: %{all_license} License: %{all_license}
URL: http://www.gnu.org/software/glibc/ URL: http://www.gnu.org/software/glibc/
@ -280,6 +280,7 @@ Patch9029: 5_6-LoongArch-Optimize-string-function-strcpy.patch
Patch9030: 6_6-LoongArch-Optimize-string-functions-strlen-strnlen.patch Patch9030: 6_6-LoongArch-Optimize-string-functions-strlen-strnlen.patch
Patch9031: math-Fix-asin-and-acos-invalid-exception-with-old-gc.patch Patch9031: math-Fix-asin-and-acos-invalid-exception-with-old-gc.patch
%endif %endif
Patch9031: add-pthread_cond_clockwait-GLIBC_2_28.patch
Provides: ldconfig rtld(GNU_HASH) bundled(gnulib) Provides: ldconfig rtld(GNU_HASH) bundled(gnulib)
@ -1445,6 +1446,10 @@ fi
%endif %endif
%changelog %changelog
* Mon Feb 6 2023 Yang Yanchao <yangyanchao6@huawei.com> - 2.34-109
- Since the pthread_cond_clockwait@GLIBC_2_28 is introduced in earlier
versions, this symbol is required to keep the previous items compatible.
* Thu Feb 2 2023 lixing <lixing@loongson.cn> - 2.34-108 * Thu Feb 2 2023 lixing <lixing@loongson.cn> - 2.34-108
- Fixup asin and acos errors for LoongArch. - Fixup asin and acos errors for LoongArch.