4d4a3834ee
- ld-show-auxv-colon.patch: elf: Fix missing colon in LD_SHOW_AUXV output (BZ #282539 - x86-string-control-test.patch: x86-64: Use testl to check __x86_string_control - pthread-kill-fail-after-exit.patch: nptl: pthread_kill, pthread_cancel should not fail after exit (BZ #19193) - pthread-kill-race-thread-exit.patch: nptl: Fix race between pthread_kill and thread exit (BZ #12889) - getcwd-attribute-access.patch: posix: Fix attribute access mode on getcwd (BZ #27476) - pthread-kill-return-esrch.patch: nptl: pthread_kill needs to return ESRCH for old programs (BZ #19193) - pthread-mutexattr-getrobust-np-type.patch: nptl: Fix type of pthread_mutexattr_getrobust_np, pthread_mutexattr_setrobust_np (BZ #28036) - setxid-deadlock-blocked-signals.patch: nptl: Avoid setxid deadlock with blocked signals in thread exit (BZ #28361) - pthread-kill-send-specific-thread.patch: nptl: pthread_kill must send signals to a specific thread (BZ #28407) - sysconf-nprocessors-affinity.patch: linux: Revert the use of sched_getaffinity on get_nproc (BZ #28310) - iconv-charmap-close-output.patch: renamed from icon-charmap-close-output.patch OBS-URL: https://build.opensuse.org/request/show/923222 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=604
40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
From 8b8a1d0b7375c547ae905917a03743ed6759c5bc Mon Sep 17 00:00:00 2001
|
|
From: Florian Weimer <fweimer@redhat.com>
|
|
Date: Tue, 21 Sep 2021 07:12:56 +0200
|
|
Subject: [PATCH] nptl: Fix type of pthread_mutexattr_getrobust_np,
|
|
pthread_mutexattr_setrobust_np (bug 28036)
|
|
|
|
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
|
|
Tested-by: Carlos O'Donell <carlos@redhat.com>
|
|
(cherry picked from commit f3e664563361dc17530113b3205998d1f19dc4d9)
|
|
---
|
|
NEWS | 1 +
|
|
sysdeps/nptl/pthread.h | 4 ++--
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h
|
|
index f1b7f2bdc6..43146e91c9 100644
|
|
--- a/sysdeps/nptl/pthread.h
|
|
+++ b/sysdeps/nptl/pthread.h
|
|
@@ -933,7 +933,7 @@ extern int pthread_mutexattr_getrobust (const pthread_mutexattr_t *__attr,
|
|
# ifdef __USE_GNU
|
|
# ifdef __REDIRECT_NTH
|
|
extern int __REDIRECT_NTH (pthread_mutexattr_getrobust_np,
|
|
- (pthread_mutex_t *, int *),
|
|
+ (pthread_mutexattr_t *, int *),
|
|
pthread_mutexattr_getrobust) __nonnull ((1))
|
|
__attribute_deprecated_msg__ ("\
|
|
pthread_mutexattr_getrobust_np is deprecated, use pthread_mutexattr_getrobust");
|
|
@@ -949,7 +949,7 @@ extern int pthread_mutexattr_setrobust (pthread_mutexattr_t *__attr,
|
|
# ifdef __USE_GNU
|
|
# ifdef __REDIRECT_NTH
|
|
extern int __REDIRECT_NTH (pthread_mutexattr_setrobust_np,
|
|
- (pthread_mutex_t *, int),
|
|
+ (pthread_mutexattr_t *, int),
|
|
pthread_mutexattr_setrobust) __nonnull ((1))
|
|
__attribute_deprecated_msg__ ("\
|
|
pthread_mutexattr_setrobust_np is deprecated, use pthread_mutexattr_setrobust");
|
|
--
|
|
2.33.0
|
|
|