From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: Florian Weimer <fweimer@redhat.com>, libc-alpha@sourceware.org
Subject: Re: [PATCH 2/3] nptl: Move __pthread_register_cancel_defer, __pthread_unregister_cancel_restore to libc
Date: Tue, 11 May 2021 14:29:32 -0300 [thread overview]
Message-ID: <81de9c88-a024-27b7-aab7-08ae38635eb9@linaro.org> (raw)
In-Reply-To: <a4de1f7f79a92ea6caafc62639cbb21644d68958.1620730539.git.fweimer@redhat.com>
On 11/05/2021 07:56, Florian Weimer via Libc-alpha wrote:
> The symbols were moved using scripts/move-symbol-to-libc.py.
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> nptl/Makefile | 2 +-
> nptl/Versions | 6 ++++--
> nptl/cleanup_defer.c | 19 ++++++++++++++++---
> sysdeps/unix/sysv/linux/aarch64/libc.abilist | 4 ++++
> .../sysv/linux/aarch64/libpthread.abilist | 2 --
> sysdeps/unix/sysv/linux/alpha/libc.abilist | 4 ++++
> .../unix/sysv/linux/alpha/libpthread.abilist | 2 --
> sysdeps/unix/sysv/linux/arc/libc.abilist | 4 ++++
> .../unix/sysv/linux/arc/libpthread.abilist | 2 --
> sysdeps/unix/sysv/linux/arm/be/libc.abilist | 4 ++++
> .../unix/sysv/linux/arm/be/libpthread.abilist | 2 --
> sysdeps/unix/sysv/linux/arm/le/libc.abilist | 4 ++++
> .../unix/sysv/linux/arm/le/libpthread.abilist | 2 --
> sysdeps/unix/sysv/linux/csky/libc.abilist | 4 ++++
> .../unix/sysv/linux/csky/libpthread.abilist | 2 --
> sysdeps/unix/sysv/linux/hppa/libc.abilist | 4 ++++
> .../unix/sysv/linux/hppa/libpthread.abilist | 2 --
> sysdeps/unix/sysv/linux/i386/libc.abilist | 4 ++++
> .../unix/sysv/linux/i386/libpthread.abilist | 2 --
> sysdeps/unix/sysv/linux/ia64/libc.abilist | 4 ++++
> .../unix/sysv/linux/ia64/libpthread.abilist | 2 --
> .../sysv/linux/m68k/coldfire/libc.abilist | 4 ++++
> .../linux/m68k/coldfire/libpthread.abilist | 2 --
> .../unix/sysv/linux/m68k/m680x0/libc.abilist | 4 ++++
> .../sysv/linux/m68k/m680x0/libpthread.abilist | 2 --
> .../sysv/linux/microblaze/be/libc.abilist | 4 ++++
> .../linux/microblaze/be/libpthread.abilist | 2 --
> .../sysv/linux/microblaze/le/libc.abilist | 4 ++++
> .../linux/microblaze/le/libpthread.abilist | 2 --
> .../sysv/linux/mips/mips32/fpu/libc.abilist | 4 ++++
> .../sysv/linux/mips/mips32/libpthread.abilist | 2 --
> .../sysv/linux/mips/mips32/nofpu/libc.abilist | 4 ++++
> .../sysv/linux/mips/mips64/libpthread.abilist | 2 --
> .../sysv/linux/mips/mips64/n32/libc.abilist | 4 ++++
> .../sysv/linux/mips/mips64/n64/libc.abilist | 4 ++++
> sysdeps/unix/sysv/linux/nios2/libc.abilist | 4 ++++
> .../unix/sysv/linux/nios2/libpthread.abilist | 2 --
> .../linux/powerpc/powerpc32/fpu/libc.abilist | 4 ++++
> .../powerpc/powerpc32/libpthread.abilist | 2 --
> .../powerpc/powerpc32/nofpu/libc.abilist | 4 ++++
> .../linux/powerpc/powerpc64/be/libc.abilist | 4 ++++
> .../powerpc/powerpc64/be/libpthread.abilist | 2 --
> .../linux/powerpc/powerpc64/le/libc.abilist | 4 ++++
> .../powerpc/powerpc64/le/libpthread.abilist | 2 --
> .../unix/sysv/linux/riscv/rv32/libc.abilist | 4 ++++
> .../sysv/linux/riscv/rv32/libpthread.abilist | 2 --
> .../unix/sysv/linux/riscv/rv64/libc.abilist | 4 ++++
> .../sysv/linux/riscv/rv64/libpthread.abilist | 2 --
> .../unix/sysv/linux/s390/s390-32/libc.abilist | 4 ++++
> .../linux/s390/s390-32/libpthread.abilist | 2 --
> .../unix/sysv/linux/s390/s390-64/libc.abilist | 4 ++++
> .../linux/s390/s390-64/libpthread.abilist | 2 --
> sysdeps/unix/sysv/linux/sh/be/libc.abilist | 4 ++++
> .../unix/sysv/linux/sh/be/libpthread.abilist | 2 --
> sysdeps/unix/sysv/linux/sh/le/libc.abilist | 4 ++++
> .../unix/sysv/linux/sh/le/libpthread.abilist | 2 --
> .../sysv/linux/sparc/sparc32/libc.abilist | 4 ++++
> .../linux/sparc/sparc32/libpthread.abilist | 2 --
> .../sysv/linux/sparc/sparc64/libc.abilist | 4 ++++
> .../linux/sparc/sparc64/libpthread.abilist | 2 --
> .../unix/sysv/linux/x86_64/64/libc.abilist | 4 ++++
> .../sysv/linux/x86_64/64/libpthread.abilist | 2 --
> .../unix/sysv/linux/x86_64/x32/libc.abilist | 4 ++++
> .../sysv/linux/x86_64/x32/libpthread.abilist | 2 --
> 64 files changed, 149 insertions(+), 64 deletions(-)
>
> diff --git a/nptl/Makefile b/nptl/Makefile
> index eb6c910656..7e070e490b 100644
> --- a/nptl/Makefile
> +++ b/nptl/Makefile
> @@ -33,6 +33,7 @@ routines = \
> cancellation \
> cleanup \
> cleanup_compat \
> + cleanup_defer \
> cleanup_defer_compat \
> cleanup_routine \
> elision-conf \
Ok.
> @@ -187,7 +188,6 @@ shared-only-routines = forward
> static-only-routines = pthread_atfork
>
> libpthread-routines = \
> - cleanup_defer \
> events \
> libpthread-compat \
> nptl-init \
Ok.
> diff --git a/nptl/Versions b/nptl/Versions
> index 329f0722a6..0868a8cfb2 100644
> --- a/nptl/Versions
> +++ b/nptl/Versions
> @@ -144,7 +144,9 @@ libc {
> GLIBC_2.3.3 {
> __pthread_cleanup_routine;
> __pthread_register_cancel;
> + __pthread_register_cancel_defer;
> __pthread_unregister_cancel;
> + __pthread_unregister_cancel_restore;
> __pthread_unwind_next;
> pthread_attr_setaffinity_np;
> pthread_barrierattr_getpshared;
> @@ -227,7 +229,9 @@ libc {
> __pthread_mutex_lock;
> __pthread_mutex_unlock;
> __pthread_register_cancel;
> + __pthread_register_cancel_defer;
> __pthread_unregister_cancel;
> + __pthread_unregister_cancel_restore;
> call_once;
> cnd_broadcast;
> cnd_destroy;
> @@ -430,8 +434,6 @@ libpthread {
> }
>
> GLIBC_2.3.3 {
> - __pthread_register_cancel_defer;
> - __pthread_unregister_cancel_restore;
> pthread_attr_getaffinity_np;
> pthread_setaffinity_np;
> }
Ok.
> diff --git a/nptl/cleanup_defer.c b/nptl/cleanup_defer.c
> index 08271e352f..6d85359118 100644
> --- a/nptl/cleanup_defer.c
> +++ b/nptl/cleanup_defer.c
> @@ -18,11 +18,11 @@
>
> #include <stdlib.h>
> #include "pthreadP.h"
> -
> +#include <shlib-compat.h>
>
> void
> __cleanup_fct_attribute
> -__pthread_register_cancel_defer (__pthread_unwind_buf_t *buf)
> +___pthread_register_cancel_defer (__pthread_unwind_buf_t *buf)
> {
> struct pthread_unwind_buf *ibuf = (struct pthread_unwind_buf *) buf;
> struct pthread *self = THREAD_SELF;
> @@ -56,11 +56,17 @@ __pthread_register_cancel_defer (__pthread_unwind_buf_t *buf)
> /* Store the new cleanup handler info. */
> THREAD_SETMEM (self, cleanup_jmp_buf, (struct pthread_unwind_buf *) buf);
> }
> +versioned_symbol (libc, ___pthread_register_cancel_defer,
> + __pthread_register_cancel_defer, GLIBC_2_34);
>
> +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_34)
> +compat_symbol (libpthread, ___pthread_register_cancel_defer,
> + __pthread_register_cancel_defer, GLIBC_2_3_3);
> +#endif
Ok.
>
> void
> __cleanup_fct_attribute
> -__pthread_unregister_cancel_restore (__pthread_unwind_buf_t *buf)
> +___pthread_unregister_cancel_restore (__pthread_unwind_buf_t *buf)
> {
> struct pthread *self = THREAD_SELF;
> struct pthread_unwind_buf *ibuf = (struct pthread_unwind_buf *) buf;
> @@ -89,3 +95,10 @@ __pthread_unregister_cancel_restore (__pthread_unwind_buf_t *buf)
> CANCELLATION_P (self);
> }
> }
> +versioned_symbol (libc, ___pthread_unregister_cancel_restore,
> + __pthread_unregister_cancel_restore, GLIBC_2_34);
> +
> +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_34)
> +compat_symbol (libpthread, ___pthread_unregister_cancel_restore,
> + __pthread_unregister_cancel_restore, GLIBC_2_3_3);
> +#endif
Ok.
> diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> index 68afc4d209..79b373a45d 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
> @@ -351,6 +351,7 @@ GLIBC_2.17 __pthread_mutexattr_init F
> GLIBC_2.17 __pthread_mutexattr_settype F
> GLIBC_2.17 __pthread_once F
> GLIBC_2.17 __pthread_register_cancel F
> +GLIBC_2.17 __pthread_register_cancel_defer F
> GLIBC_2.17 __pthread_rwlock_destroy F
> GLIBC_2.17 __pthread_rwlock_init F
> GLIBC_2.17 __pthread_rwlock_rdlock F
> @@ -360,6 +361,7 @@ GLIBC_2.17 __pthread_rwlock_unlock F
> GLIBC_2.17 __pthread_rwlock_wrlock F
> GLIBC_2.17 __pthread_setspecific F
> GLIBC_2.17 __pthread_unregister_cancel F
> +GLIBC_2.17 __pthread_unregister_cancel_restore F
> GLIBC_2.17 __pthread_unwind_next F
> GLIBC_2.17 __ptsname_r_chk F
> GLIBC_2.17 __pwrite64 F
> @@ -2308,7 +2310,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> index 633df92b7c..72bbdf0f37 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> @@ -1,6 +1,4 @@
> GLIBC_2.17 __errno_location F
> -GLIBC_2.17 __pthread_register_cancel_defer F
> -GLIBC_2.17 __pthread_unregister_cancel_restore F
> GLIBC_2.17 pthread_attr_getaffinity_np F
> GLIBC_2.17 pthread_attr_getguardsize F
> GLIBC_2.17 pthread_attr_getstack F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
> index 0eee74431c..8961d6799c 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
> @@ -2269,7 +2269,9 @@ GLIBC_2.3.2 pthread_cond_wait F
> GLIBC_2.3.2 strptime_l F
> GLIBC_2.3.3 __pthread_cleanup_routine F
> GLIBC_2.3.3 __pthread_register_cancel F
> +GLIBC_2.3.3 __pthread_register_cancel_defer F
> GLIBC_2.3.3 __pthread_unregister_cancel F
> +GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 __pthread_unwind_next F
> GLIBC_2.3.3 _sys_siglist D 0x208
> GLIBC_2.3.3 gnu_dev_major F
> @@ -2395,7 +2397,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> index fa996f19d7..19e1375b54 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> @@ -23,8 +23,6 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
> GLIBC_2.2.6 __libpthread_version_placeholder F
> GLIBC_2.28 thrd_create F
> GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 __pthread_register_cancel_defer F
> -GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 pthread_attr_getaffinity_np F
> GLIBC_2.3.3 pthread_attr_setstack F
> GLIBC_2.3.3 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
> index 3caf14215d..47504af7fa 100644
> --- a/sysdeps/unix/sysv/linux/arc/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
> @@ -340,6 +340,7 @@ GLIBC_2.32 __pthread_mutexattr_init F
> GLIBC_2.32 __pthread_mutexattr_settype F
> GLIBC_2.32 __pthread_once F
> GLIBC_2.32 __pthread_register_cancel F
> +GLIBC_2.32 __pthread_register_cancel_defer F
> GLIBC_2.32 __pthread_rwlock_destroy F
> GLIBC_2.32 __pthread_rwlock_init F
> GLIBC_2.32 __pthread_rwlock_rdlock F
> @@ -349,6 +350,7 @@ GLIBC_2.32 __pthread_rwlock_unlock F
> GLIBC_2.32 __pthread_rwlock_wrlock F
> GLIBC_2.32 __pthread_setspecific F
> GLIBC_2.32 __pthread_unregister_cancel F
> +GLIBC_2.32 __pthread_unregister_cancel_restore F
> GLIBC_2.32 __pthread_unwind_next F
> GLIBC_2.32 __ptsname_r_chk F
> GLIBC_2.32 __pwrite64 F
> @@ -2067,7 +2069,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
> index 93f0474e31..d47f656bf3 100644
> --- a/sysdeps/unix/sysv/linux/arc/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
> @@ -1,6 +1,4 @@
> GLIBC_2.32 __errno_location F
> -GLIBC_2.32 __pthread_register_cancel_defer F
> -GLIBC_2.32 __pthread_unregister_cancel_restore F
> GLIBC_2.32 pthread_attr_getaffinity_np F
> GLIBC_2.32 pthread_attr_getguardsize F
> GLIBC_2.32 pthread_attr_getstack F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> index 1cf65ff0c7..1a4395ba35 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
> @@ -191,7 +191,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> @@ -630,6 +632,7 @@ GLIBC_2.4 __pthread_mutexattr_init F
> GLIBC_2.4 __pthread_mutexattr_settype F
> GLIBC_2.4 __pthread_once F
> GLIBC_2.4 __pthread_register_cancel F
> +GLIBC_2.4 __pthread_register_cancel_defer F
> GLIBC_2.4 __pthread_rwlock_destroy F
> GLIBC_2.4 __pthread_rwlock_init F
> GLIBC_2.4 __pthread_rwlock_rdlock F
> @@ -639,6 +642,7 @@ GLIBC_2.4 __pthread_rwlock_unlock F
> GLIBC_2.4 __pthread_rwlock_wrlock F
> GLIBC_2.4 __pthread_setspecific F
> GLIBC_2.4 __pthread_unregister_cancel F
> +GLIBC_2.4 __pthread_unregister_cancel_restore F
> GLIBC_2.4 __pthread_unwind_next F
> GLIBC_2.4 __ptsname_r_chk F
> GLIBC_2.4 __pwrite64 F
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> index fcf9bae888..dffabc237c 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> @@ -7,8 +7,6 @@ GLIBC_2.30 __libpthread_version_placeholder F
> GLIBC_2.31 __libpthread_version_placeholder F
> GLIBC_2.4 __errno_location F
> GLIBC_2.4 __libpthread_version_placeholder F
> -GLIBC_2.4 __pthread_register_cancel_defer F
> -GLIBC_2.4 __pthread_unregister_cancel_restore F
> GLIBC_2.4 pthread_attr_getaffinity_np F
> GLIBC_2.4 pthread_attr_getguardsize F
> GLIBC_2.4 pthread_attr_getstack F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> index 26428e0030..2344dc0638 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
> @@ -188,7 +188,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> @@ -627,6 +629,7 @@ GLIBC_2.4 __pthread_mutexattr_init F
> GLIBC_2.4 __pthread_mutexattr_settype F
> GLIBC_2.4 __pthread_once F
> GLIBC_2.4 __pthread_register_cancel F
> +GLIBC_2.4 __pthread_register_cancel_defer F
> GLIBC_2.4 __pthread_rwlock_destroy F
> GLIBC_2.4 __pthread_rwlock_init F
> GLIBC_2.4 __pthread_rwlock_rdlock F
> @@ -636,6 +639,7 @@ GLIBC_2.4 __pthread_rwlock_unlock F
> GLIBC_2.4 __pthread_rwlock_wrlock F
> GLIBC_2.4 __pthread_setspecific F
> GLIBC_2.4 __pthread_unregister_cancel F
> +GLIBC_2.4 __pthread_unregister_cancel_restore F
> GLIBC_2.4 __pthread_unwind_next F
> GLIBC_2.4 __ptsname_r_chk F
> GLIBC_2.4 __pwrite64 F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> index fcf9bae888..dffabc237c 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> @@ -7,8 +7,6 @@ GLIBC_2.30 __libpthread_version_placeholder F
> GLIBC_2.31 __libpthread_version_placeholder F
> GLIBC_2.4 __errno_location F
> GLIBC_2.4 __libpthread_version_placeholder F
> -GLIBC_2.4 __pthread_register_cancel_defer F
> -GLIBC_2.4 __pthread_unregister_cancel_restore F
> GLIBC_2.4 pthread_attr_getaffinity_np F
> GLIBC_2.4 pthread_attr_getguardsize F
> GLIBC_2.4 pthread_attr_getstack F
> diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
> index ae01f32a0c..b3aec7bdad 100644
> --- a/sysdeps/unix/sysv/linux/csky/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
> @@ -344,6 +344,7 @@ GLIBC_2.29 __pthread_mutexattr_init F
> GLIBC_2.29 __pthread_mutexattr_settype F
> GLIBC_2.29 __pthread_once F
> GLIBC_2.29 __pthread_register_cancel F
> +GLIBC_2.29 __pthread_register_cancel_defer F
> GLIBC_2.29 __pthread_rwlock_destroy F
> GLIBC_2.29 __pthread_rwlock_init F
> GLIBC_2.29 __pthread_rwlock_rdlock F
> @@ -353,6 +354,7 @@ GLIBC_2.29 __pthread_rwlock_unlock F
> GLIBC_2.29 __pthread_rwlock_wrlock F
> GLIBC_2.29 __pthread_setspecific F
> GLIBC_2.29 __pthread_unregister_cancel F
> +GLIBC_2.29 __pthread_unregister_cancel_restore F
> GLIBC_2.29 __pthread_unwind_next F
> GLIBC_2.29 __ptsname_r_chk F
> GLIBC_2.29 __pwrite64 F
> @@ -2251,7 +2253,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> index df027689e8..2b66c04b6c 100644
> --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> @@ -1,6 +1,4 @@
> GLIBC_2.29 __errno_location F
> -GLIBC_2.29 __pthread_register_cancel_defer F
> -GLIBC_2.29 __pthread_unregister_cancel_restore F
> GLIBC_2.29 pthread_attr_getaffinity_np F
> GLIBC_2.29 pthread_attr_getguardsize F
> GLIBC_2.29 pthread_attr_getstack F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
> index 166af94540..59afc75408 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
> @@ -2104,7 +2104,9 @@ GLIBC_2.3.2 pthread_cond_wait F
> GLIBC_2.3.2 strptime_l F
> GLIBC_2.3.3 __pthread_cleanup_routine F
> GLIBC_2.3.3 __pthread_register_cancel F
> +GLIBC_2.3.3 __pthread_register_cancel_defer F
> GLIBC_2.3.3 __pthread_unregister_cancel F
> +GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 __pthread_unwind_next F
> GLIBC_2.3.3 _sys_siglist D 0x104
> GLIBC_2.3.3 gnu_dev_major F
> @@ -2202,7 +2204,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> index 071fd3e5eb..7ee08fbcc9 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> @@ -20,8 +20,6 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
> GLIBC_2.2.6 __libpthread_version_placeholder F
> GLIBC_2.28 thrd_create F
> GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 __pthread_register_cancel_defer F
> -GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 pthread_attr_getaffinity_np F
> GLIBC_2.3.3 pthread_setaffinity_np F
> GLIBC_2.3.4 pthread_attr_getaffinity_np F
> diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
> index 37b5718e49..eabfdee4bb 100644
> --- a/sysdeps/unix/sysv/linux/i386/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
> @@ -2284,7 +2284,9 @@ GLIBC_2.3.2 pthread_cond_wait F
> GLIBC_2.3.2 strptime_l F
> GLIBC_2.3.3 __pthread_cleanup_routine F
> GLIBC_2.3.3 __pthread_register_cancel F
> +GLIBC_2.3.3 __pthread_register_cancel_defer F
> GLIBC_2.3.3 __pthread_unregister_cancel F
> +GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 __pthread_unwind_next F
> GLIBC_2.3.3 _sys_siglist D 0x104
> GLIBC_2.3.3 gnu_dev_major F
> @@ -2385,7 +2387,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> index a67cc86dcd..f2c64dd9c8 100644
> --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> @@ -23,8 +23,6 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
> GLIBC_2.2.6 __libpthread_version_placeholder F
> GLIBC_2.28 thrd_create F
> GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 __pthread_register_cancel_defer F
> -GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 pthread_attr_getaffinity_np F
> GLIBC_2.3.3 pthread_setaffinity_np F
> GLIBC_2.3.4 pthread_attr_getaffinity_np F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
> index 2273cff802..8307bd5568 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
> @@ -2137,7 +2137,9 @@ GLIBC_2.3.2 pthread_cond_wait F
> GLIBC_2.3.2 strptime_l F
> GLIBC_2.3.3 __pthread_cleanup_routine F
> GLIBC_2.3.3 __pthread_register_cancel F
> +GLIBC_2.3.3 __pthread_register_cancel_defer F
> GLIBC_2.3.3 __pthread_unregister_cancel F
> +GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 __pthread_unwind_next F
> GLIBC_2.3.3 _sys_siglist D 0x208
> GLIBC_2.3.3 gnu_dev_major F
> @@ -2236,7 +2238,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> index 2dbc645d17..f11429ad6b 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> @@ -20,8 +20,6 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
> GLIBC_2.2.6 __libpthread_version_placeholder F
> GLIBC_2.28 thrd_create F
> GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 __pthread_register_cancel_defer F
> -GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 pthread_attr_getaffinity_np F
> GLIBC_2.3.3 pthread_attr_setstack F
> GLIBC_2.3.3 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> index 54822cb0ff..faeb98053c 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
> @@ -192,7 +192,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> @@ -616,6 +618,7 @@ GLIBC_2.4 __pthread_mutexattr_init F
> GLIBC_2.4 __pthread_mutexattr_settype F
> GLIBC_2.4 __pthread_once F
> GLIBC_2.4 __pthread_register_cancel F
> +GLIBC_2.4 __pthread_register_cancel_defer F
> GLIBC_2.4 __pthread_rwlock_destroy F
> GLIBC_2.4 __pthread_rwlock_init F
> GLIBC_2.4 __pthread_rwlock_rdlock F
> @@ -625,6 +628,7 @@ GLIBC_2.4 __pthread_rwlock_unlock F
> GLIBC_2.4 __pthread_rwlock_wrlock F
> GLIBC_2.4 __pthread_setspecific F
> GLIBC_2.4 __pthread_unregister_cancel F
> +GLIBC_2.4 __pthread_unregister_cancel_restore F
> GLIBC_2.4 __pthread_unwind_next F
> GLIBC_2.4 __ptsname_r_chk F
> GLIBC_2.4 __pwrite64 F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> index fcf9bae888..dffabc237c 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> @@ -7,8 +7,6 @@ GLIBC_2.30 __libpthread_version_placeholder F
> GLIBC_2.31 __libpthread_version_placeholder F
> GLIBC_2.4 __errno_location F
> GLIBC_2.4 __libpthread_version_placeholder F
> -GLIBC_2.4 __pthread_register_cancel_defer F
> -GLIBC_2.4 __pthread_unregister_cancel_restore F
> GLIBC_2.4 pthread_attr_getaffinity_np F
> GLIBC_2.4 pthread_attr_getguardsize F
> GLIBC_2.4 pthread_attr_getstack F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> index 78676b83eb..987c85a011 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
> @@ -2227,7 +2227,9 @@ GLIBC_2.3.2 pthread_cond_wait F
> GLIBC_2.3.2 strptime_l F
> GLIBC_2.3.3 __pthread_cleanup_routine F
> GLIBC_2.3.3 __pthread_register_cancel F
> +GLIBC_2.3.3 __pthread_register_cancel_defer F
> GLIBC_2.3.3 __pthread_unregister_cancel F
> +GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 __pthread_unwind_next F
> GLIBC_2.3.3 _sys_siglist D 0x104
> GLIBC_2.3.3 gnu_dev_major F
> @@ -2328,7 +2330,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> index a67cc86dcd..f2c64dd9c8 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> @@ -23,8 +23,6 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
> GLIBC_2.2.6 __libpthread_version_placeholder F
> GLIBC_2.28 thrd_create F
> GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 __pthread_register_cancel_defer F
> -GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 pthread_attr_getaffinity_np F
> GLIBC_2.3.3 pthread_setaffinity_np F
> GLIBC_2.3.4 pthread_attr_getaffinity_np F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> index ddc36aaa80..45f5b21895 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
> @@ -352,6 +352,7 @@ GLIBC_2.18 __pthread_mutexattr_init F
> GLIBC_2.18 __pthread_mutexattr_settype F
> GLIBC_2.18 __pthread_once F
> GLIBC_2.18 __pthread_register_cancel F
> +GLIBC_2.18 __pthread_register_cancel_defer F
> GLIBC_2.18 __pthread_rwlock_destroy F
> GLIBC_2.18 __pthread_rwlock_init F
> GLIBC_2.18 __pthread_rwlock_rdlock F
> @@ -361,6 +362,7 @@ GLIBC_2.18 __pthread_rwlock_unlock F
> GLIBC_2.18 __pthread_rwlock_wrlock F
> GLIBC_2.18 __pthread_setspecific F
> GLIBC_2.18 __pthread_unregister_cancel F
> +GLIBC_2.18 __pthread_unregister_cancel_restore F
> GLIBC_2.18 __pthread_unwind_next F
> GLIBC_2.18 __ptsname_r_chk F
> GLIBC_2.18 __pwrite64 F
> @@ -2302,7 +2304,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> index f3a5b67d41..93b99ca4a7 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> @@ -1,6 +1,4 @@
> GLIBC_2.18 __errno_location F
> -GLIBC_2.18 __pthread_register_cancel_defer F
> -GLIBC_2.18 __pthread_unregister_cancel_restore F
> GLIBC_2.18 pthread_attr_getaffinity_np F
> GLIBC_2.18 pthread_attr_getguardsize F
> GLIBC_2.18 pthread_attr_getstack F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> index 410cf82c0e..ce10bfbf47 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
> @@ -352,6 +352,7 @@ GLIBC_2.18 __pthread_mutexattr_init F
> GLIBC_2.18 __pthread_mutexattr_settype F
> GLIBC_2.18 __pthread_once F
> GLIBC_2.18 __pthread_register_cancel F
> +GLIBC_2.18 __pthread_register_cancel_defer F
> GLIBC_2.18 __pthread_rwlock_destroy F
> GLIBC_2.18 __pthread_rwlock_init F
> GLIBC_2.18 __pthread_rwlock_rdlock F
> @@ -361,6 +362,7 @@ GLIBC_2.18 __pthread_rwlock_unlock F
> GLIBC_2.18 __pthread_rwlock_wrlock F
> GLIBC_2.18 __pthread_setspecific F
> GLIBC_2.18 __pthread_unregister_cancel F
> +GLIBC_2.18 __pthread_unregister_cancel_restore F
> GLIBC_2.18 __pthread_unwind_next F
> GLIBC_2.18 __ptsname_r_chk F
> GLIBC_2.18 __pwrite64 F
> @@ -2299,7 +2301,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> index f3a5b67d41..93b99ca4a7 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> @@ -1,6 +1,4 @@
> GLIBC_2.18 __errno_location F
> -GLIBC_2.18 __pthread_register_cancel_defer F
> -GLIBC_2.18 __pthread_unregister_cancel_restore F
> GLIBC_2.18 pthread_attr_getaffinity_np F
> GLIBC_2.18 pthread_attr_getguardsize F
> GLIBC_2.18 pthread_attr_getstack F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> index 9a2b97b6e2..c09f0f7634 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
> @@ -2193,7 +2193,9 @@ GLIBC_2.3.2 pthread_cond_wait F
> GLIBC_2.3.2 strptime_l F
> GLIBC_2.3.3 __pthread_cleanup_routine F
> GLIBC_2.3.3 __pthread_register_cancel F
> +GLIBC_2.3.3 __pthread_register_cancel_defer F
> GLIBC_2.3.3 __pthread_unregister_cancel F
> +GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 __pthread_unwind_next F
> GLIBC_2.3.3 _sys_siglist D 0x200
> GLIBC_2.3.3 gnu_dev_major F
> @@ -2291,7 +2293,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> index 26ae04300c..156eae46c9 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> @@ -21,8 +21,6 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
> GLIBC_2.2.6 __libpthread_version_placeholder F
> GLIBC_2.28 thrd_create F
> GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 __pthread_register_cancel_defer F
> -GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 pthread_attr_getaffinity_np F
> GLIBC_2.3.3 pthread_attr_setstack F
> GLIBC_2.3.3 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> index e73613e7d7..bf2f7a8bb5 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
> @@ -2191,7 +2191,9 @@ GLIBC_2.3.2 pthread_cond_wait F
> GLIBC_2.3.2 strptime_l F
> GLIBC_2.3.3 __pthread_cleanup_routine F
> GLIBC_2.3.3 __pthread_register_cancel F
> +GLIBC_2.3.3 __pthread_register_cancel_defer F
> GLIBC_2.3.3 __pthread_unregister_cancel F
> +GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 __pthread_unwind_next F
> GLIBC_2.3.3 _sys_siglist D 0x200
> GLIBC_2.3.3 gnu_dev_major F
> @@ -2289,7 +2291,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> index 26ae04300c..156eae46c9 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> @@ -21,8 +21,6 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
> GLIBC_2.2.6 __libpthread_version_placeholder F
> GLIBC_2.28 thrd_create F
> GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 __pthread_register_cancel_defer F
> -GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 pthread_attr_getaffinity_np F
> GLIBC_2.3.3 pthread_attr_setstack F
> GLIBC_2.3.3 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> index 7512fb6e4e..7f37f64c2e 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
> @@ -2199,7 +2199,9 @@ GLIBC_2.3.2 pthread_cond_wait F
> GLIBC_2.3.2 strptime_l F
> GLIBC_2.3.3 __pthread_cleanup_routine F
> GLIBC_2.3.3 __pthread_register_cancel F
> +GLIBC_2.3.3 __pthread_register_cancel_defer F
> GLIBC_2.3.3 __pthread_unregister_cancel F
> +GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 __pthread_unwind_next F
> GLIBC_2.3.3 _sys_siglist D 0x200
> GLIBC_2.3.3 gnu_dev_major F
> @@ -2297,7 +2299,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> index 41578b8c93..1db4d23af4 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
> @@ -2192,7 +2192,9 @@ GLIBC_2.3.2 pthread_cond_wait F
> GLIBC_2.3.2 strptime_l F
> GLIBC_2.3.3 __pthread_cleanup_routine F
> GLIBC_2.3.3 __pthread_register_cancel F
> +GLIBC_2.3.3 __pthread_register_cancel_defer F
> GLIBC_2.3.3 __pthread_unregister_cancel F
> +GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 __pthread_unwind_next F
> GLIBC_2.3.3 _sys_siglist D 0x400
> GLIBC_2.3.3 gnu_dev_major F
> @@ -2291,7 +2293,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
> index 34fff4c240..fc563e2b6e 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
> @@ -389,6 +389,7 @@ GLIBC_2.21 __pthread_mutexattr_init F
> GLIBC_2.21 __pthread_mutexattr_settype F
> GLIBC_2.21 __pthread_once F
> GLIBC_2.21 __pthread_register_cancel F
> +GLIBC_2.21 __pthread_register_cancel_defer F
> GLIBC_2.21 __pthread_rwlock_destroy F
> GLIBC_2.21 __pthread_rwlock_init F
> GLIBC_2.21 __pthread_rwlock_rdlock F
> @@ -398,6 +399,7 @@ GLIBC_2.21 __pthread_rwlock_unlock F
> GLIBC_2.21 __pthread_rwlock_wrlock F
> GLIBC_2.21 __pthread_setspecific F
> GLIBC_2.21 __pthread_unregister_cancel F
> +GLIBC_2.21 __pthread_unregister_cancel_restore F
> GLIBC_2.21 __pthread_unwind_next F
> GLIBC_2.21 __ptsname_r_chk F
> GLIBC_2.21 __pwrite64 F
> @@ -2341,7 +2343,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> index 9bee776f4f..b7c7c83d68 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> @@ -1,6 +1,4 @@
> GLIBC_2.21 __errno_location F
> -GLIBC_2.21 __pthread_register_cancel_defer F
> -GLIBC_2.21 __pthread_unregister_cancel_restore F
> GLIBC_2.21 pthread_attr_getaffinity_np F
> GLIBC_2.21 pthread_attr_getguardsize F
> GLIBC_2.21 pthread_attr_getstack F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> index 8b8adc06ce..6e85b889b8 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
> @@ -2231,7 +2231,9 @@ GLIBC_2.3.2 pthread_cond_wait F
> GLIBC_2.3.2 strptime_l F
> GLIBC_2.3.3 __pthread_cleanup_routine F
> GLIBC_2.3.3 __pthread_register_cancel F
> +GLIBC_2.3.3 __pthread_register_cancel_defer F
> GLIBC_2.3.3 __pthread_unregister_cancel F
> +GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 __pthread_unwind_next F
> GLIBC_2.3.3 _sys_siglist D 0x104
> GLIBC_2.3.3 getcontext F
> @@ -2355,7 +2357,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> index a30be35a7a..17be75afae 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> @@ -23,8 +23,6 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
> GLIBC_2.2.6 __libpthread_version_placeholder F
> GLIBC_2.28 thrd_create F
> GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 __pthread_register_cancel_defer F
> -GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 pthread_attr_getaffinity_np F
> GLIBC_2.3.3 pthread_setaffinity_np F
> GLIBC_2.3.4 pthread_attr_getaffinity_np F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> index 5754fd3589..e3e8390e0e 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
> @@ -2264,7 +2264,9 @@ GLIBC_2.3.2 pthread_cond_wait F
> GLIBC_2.3.2 strptime_l F
> GLIBC_2.3.3 __pthread_cleanup_routine F
> GLIBC_2.3.3 __pthread_register_cancel F
> +GLIBC_2.3.3 __pthread_register_cancel_defer F
> GLIBC_2.3.3 __pthread_unregister_cancel F
> +GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 __pthread_unwind_next F
> GLIBC_2.3.3 _sys_siglist D 0x104
> GLIBC_2.3.3 getcontext F
> @@ -2388,7 +2390,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> index 47812d2be1..26a638edc8 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
> @@ -2084,7 +2084,9 @@ GLIBC_2.3.2 pthread_cond_wait F
> GLIBC_2.3.2 strptime_l F
> GLIBC_2.3.3 __pthread_cleanup_routine F
> GLIBC_2.3.3 __pthread_register_cancel F
> +GLIBC_2.3.3 __pthread_register_cancel_defer F
> GLIBC_2.3.3 __pthread_unregister_cancel F
> +GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 __pthread_unwind_next F
> GLIBC_2.3.3 _sys_siglist D 0x208
> GLIBC_2.3.3 gnu_dev_major F
> @@ -2203,7 +2205,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> index 5129d976a1..1549e29f64 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> @@ -18,8 +18,6 @@ GLIBC_2.3 pthread_getconcurrency F
> GLIBC_2.3 pthread_getcpuclockid F
> GLIBC_2.3 pthread_setconcurrency F
> GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 __pthread_register_cancel_defer F
> -GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 pthread_attr_getaffinity_np F
> GLIBC_2.3.3 pthread_setaffinity_np F
> GLIBC_2.3.4 pthread_attr_getaffinity_np F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> index 9af9e3fba6..09560c93d2 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
> @@ -437,6 +437,7 @@ GLIBC_2.17 __pthread_mutexattr_init F
> GLIBC_2.17 __pthread_mutexattr_settype F
> GLIBC_2.17 __pthread_once F
> GLIBC_2.17 __pthread_register_cancel F
> +GLIBC_2.17 __pthread_register_cancel_defer F
> GLIBC_2.17 __pthread_rwlock_destroy F
> GLIBC_2.17 __pthread_rwlock_init F
> GLIBC_2.17 __pthread_rwlock_rdlock F
> @@ -446,6 +447,7 @@ GLIBC_2.17 __pthread_rwlock_unlock F
> GLIBC_2.17 __pthread_rwlock_wrlock F
> GLIBC_2.17 __pthread_setspecific F
> GLIBC_2.17 __pthread_unregister_cancel F
> +GLIBC_2.17 __pthread_unregister_cancel_restore F
> GLIBC_2.17 __pthread_unwind_next F
> GLIBC_2.17 __ptsname_r_chk F
> GLIBC_2.17 __pwrite64 F
> @@ -2504,7 +2506,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> index 633df92b7c..72bbdf0f37 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> @@ -1,6 +1,4 @@
> GLIBC_2.17 __errno_location F
> -GLIBC_2.17 __pthread_register_cancel_defer F
> -GLIBC_2.17 __pthread_unregister_cancel_restore F
> GLIBC_2.17 pthread_attr_getaffinity_np F
> GLIBC_2.17 pthread_attr_getguardsize F
> GLIBC_2.17 pthread_attr_getstack F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> index ce2057f817..3941ef0b70 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
> @@ -337,6 +337,7 @@ GLIBC_2.33 __pthread_mutexattr_init F
> GLIBC_2.33 __pthread_mutexattr_settype F
> GLIBC_2.33 __pthread_once F
> GLIBC_2.33 __pthread_register_cancel F
> +GLIBC_2.33 __pthread_register_cancel_defer F
> GLIBC_2.33 __pthread_rwlock_destroy F
> GLIBC_2.33 __pthread_rwlock_init F
> GLIBC_2.33 __pthread_rwlock_rdlock F
> @@ -346,6 +347,7 @@ GLIBC_2.33 __pthread_rwlock_unlock F
> GLIBC_2.33 __pthread_rwlock_wrlock F
> GLIBC_2.33 __pthread_setspecific F
> GLIBC_2.33 __pthread_unregister_cancel F
> +GLIBC_2.33 __pthread_unregister_cancel_restore F
> GLIBC_2.33 __pthread_unwind_next F
> GLIBC_2.33 __ptsname_r_chk F
> GLIBC_2.33 __pwrite64 F
> @@ -2069,7 +2071,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
> index a1b36b3b46..0efcff840e 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
> @@ -1,6 +1,4 @@
> GLIBC_2.33 __errno_location F
> -GLIBC_2.33 __pthread_register_cancel_defer F
> -GLIBC_2.33 __pthread_unregister_cancel_restore F
> GLIBC_2.33 pthread_attr_getaffinity_np F
> GLIBC_2.33 pthread_attr_getguardsize F
> GLIBC_2.33 pthread_attr_getstack F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> index e5ea5fd6e0..b0db186f7a 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
> @@ -348,6 +348,7 @@ GLIBC_2.27 __pthread_mutexattr_init F
> GLIBC_2.27 __pthread_mutexattr_settype F
> GLIBC_2.27 __pthread_once F
> GLIBC_2.27 __pthread_register_cancel F
> +GLIBC_2.27 __pthread_register_cancel_defer F
> GLIBC_2.27 __pthread_rwlock_destroy F
> GLIBC_2.27 __pthread_rwlock_init F
> GLIBC_2.27 __pthread_rwlock_rdlock F
> @@ -357,6 +358,7 @@ GLIBC_2.27 __pthread_rwlock_unlock F
> GLIBC_2.27 __pthread_rwlock_wrlock F
> GLIBC_2.27 __pthread_setspecific F
> GLIBC_2.27 __pthread_unregister_cancel F
> +GLIBC_2.27 __pthread_unregister_cancel_restore F
> GLIBC_2.27 __pthread_unwind_next F
> GLIBC_2.27 __ptsname_r_chk F
> GLIBC_2.27 __pwrite64 F
> @@ -2269,7 +2271,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> index e8dc7c3910..cf21e1dd7f 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> @@ -1,6 +1,4 @@
> GLIBC_2.27 __errno_location F
> -GLIBC_2.27 __pthread_register_cancel_defer F
> -GLIBC_2.27 __pthread_unregister_cancel_restore F
> GLIBC_2.27 pthread_attr_getaffinity_np F
> GLIBC_2.27 pthread_attr_getguardsize F
> GLIBC_2.27 pthread_attr_getstack F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> index fbb75ccf9d..60bbe8bbf5 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
> @@ -2240,7 +2240,9 @@ GLIBC_2.3.2 pthread_cond_wait F
> GLIBC_2.3.2 strptime_l F
> GLIBC_2.3.3 __pthread_cleanup_routine F
> GLIBC_2.3.3 __pthread_register_cancel F
> +GLIBC_2.3.3 __pthread_register_cancel_defer F
> GLIBC_2.3.3 __pthread_unregister_cancel F
> +GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 __pthread_unwind_next F
> GLIBC_2.3.3 _sys_siglist D 0x104
> GLIBC_2.3.3 gnu_dev_major F
> @@ -2353,7 +2355,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> index f5deee544b..6daef10e8d 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> @@ -24,8 +24,6 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
> GLIBC_2.2.6 __libpthread_version_placeholder F
> GLIBC_2.28 thrd_create F
> GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 __pthread_register_cancel_defer F
> -GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 pthread_attr_getaffinity_np F
> GLIBC_2.3.3 pthread_setaffinity_np F
> GLIBC_2.3.4 pthread_attr_getaffinity_np F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> index 7c1e46cdf0..b7bff58264 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
> @@ -2130,7 +2130,9 @@ GLIBC_2.3.2 pthread_cond_wait F
> GLIBC_2.3.2 strptime_l F
> GLIBC_2.3.3 __pthread_cleanup_routine F
> GLIBC_2.3.3 __pthread_register_cancel F
> +GLIBC_2.3.3 __pthread_register_cancel_defer F
> GLIBC_2.3.3 __pthread_unregister_cancel F
> +GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 __pthread_unwind_next F
> GLIBC_2.3.3 _sys_siglist D 0x208
> GLIBC_2.3.3 gnu_dev_major F
> @@ -2240,7 +2242,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> index 9fdcccffb0..e5998b3edc 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> @@ -21,8 +21,6 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
> GLIBC_2.2.6 __libpthread_version_placeholder F
> GLIBC_2.28 thrd_create F
> GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 __pthread_register_cancel_defer F
> -GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 pthread_attr_getaffinity_np F
> GLIBC_2.3.3 pthread_setaffinity_np F
> GLIBC_2.3.4 pthread_attr_getaffinity_np F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> index bfa7943954..46fca5bdbf 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
> @@ -2108,7 +2108,9 @@ GLIBC_2.3.2 pthread_cond_wait F
> GLIBC_2.3.2 strptime_l F
> GLIBC_2.3.3 __pthread_cleanup_routine F
> GLIBC_2.3.3 __pthread_register_cancel F
> +GLIBC_2.3.3 __pthread_register_cancel_defer F
> GLIBC_2.3.3 __pthread_unregister_cancel F
> +GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 __pthread_unwind_next F
> GLIBC_2.3.3 _sys_siglist D 0x104
> GLIBC_2.3.3 gnu_dev_major F
> @@ -2209,7 +2211,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> index 071fd3e5eb..7ee08fbcc9 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> @@ -20,8 +20,6 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
> GLIBC_2.2.6 __libpthread_version_placeholder F
> GLIBC_2.28 thrd_create F
> GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 __pthread_register_cancel_defer F
> -GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 pthread_attr_getaffinity_np F
> GLIBC_2.3.3 pthread_setaffinity_np F
> GLIBC_2.3.4 pthread_attr_getaffinity_np F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> index 440eed94c8..0d885f202e 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
> @@ -2108,7 +2108,9 @@ GLIBC_2.3.2 pthread_cond_wait F
> GLIBC_2.3.2 strptime_l F
> GLIBC_2.3.3 __pthread_cleanup_routine F
> GLIBC_2.3.3 __pthread_register_cancel F
> +GLIBC_2.3.3 __pthread_register_cancel_defer F
> GLIBC_2.3.3 __pthread_unregister_cancel F
> +GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 __pthread_unwind_next F
> GLIBC_2.3.3 _sys_siglist D 0x104
> GLIBC_2.3.3 gnu_dev_major F
> @@ -2206,7 +2208,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> index 071fd3e5eb..7ee08fbcc9 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> @@ -20,8 +20,6 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
> GLIBC_2.2.6 __libpthread_version_placeholder F
> GLIBC_2.28 thrd_create F
> GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 __pthread_register_cancel_defer F
> -GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 pthread_attr_getaffinity_np F
> GLIBC_2.3.3 pthread_setaffinity_np F
> GLIBC_2.3.4 pthread_attr_getaffinity_np F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> index 2e3f5ec667..c4571c476f 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
> @@ -2234,7 +2234,9 @@ GLIBC_2.3.2 pthread_cond_wait F
> GLIBC_2.3.2 strptime_l F
> GLIBC_2.3.3 __pthread_cleanup_routine F
> GLIBC_2.3.3 __pthread_register_cancel F
> +GLIBC_2.3.3 __pthread_register_cancel_defer F
> GLIBC_2.3.3 __pthread_unregister_cancel F
> +GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 __pthread_unwind_next F
> GLIBC_2.3.3 _sys_siglist D 0x104
> GLIBC_2.3.3 gnu_dev_major F
> @@ -2344,7 +2346,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> index fa996f19d7..19e1375b54 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> @@ -23,8 +23,6 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
> GLIBC_2.2.6 __libpthread_version_placeholder F
> GLIBC_2.28 thrd_create F
> GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 __pthread_register_cancel_defer F
> -GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 pthread_attr_getaffinity_np F
> GLIBC_2.3.3 pthread_attr_setstack F
> GLIBC_2.3.3 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> index 1a88c40a3a..cb18e01a23 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
> @@ -2159,7 +2159,9 @@ GLIBC_2.3.2 pthread_cond_wait F
> GLIBC_2.3.2 strptime_l F
> GLIBC_2.3.3 __pthread_cleanup_routine F
> GLIBC_2.3.3 __pthread_register_cancel F
> +GLIBC_2.3.3 __pthread_register_cancel_defer F
> GLIBC_2.3.3 __pthread_unregister_cancel F
> +GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 __pthread_unwind_next F
> GLIBC_2.3.3 _sys_siglist D 0x208
> GLIBC_2.3.3 gnu_dev_major F
> @@ -2257,7 +2259,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> index 2dbc645d17..f11429ad6b 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> @@ -20,8 +20,6 @@ GLIBC_2.2.3 __libpthread_version_placeholder F
> GLIBC_2.2.6 __libpthread_version_placeholder F
> GLIBC_2.28 thrd_create F
> GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 __pthread_register_cancel_defer F
> -GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 pthread_attr_getaffinity_np F
> GLIBC_2.3.3 pthread_attr_setstack F
> GLIBC_2.3.3 pthread_attr_setstacksize F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> index c0c3538772..a5a2a8cb64 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
> @@ -2118,7 +2118,9 @@ GLIBC_2.3.2 pthread_cond_wait F
> GLIBC_2.3.2 strptime_l F
> GLIBC_2.3.3 __pthread_cleanup_routine F
> GLIBC_2.3.3 __pthread_register_cancel F
> +GLIBC_2.3.3 __pthread_register_cancel_defer F
> GLIBC_2.3.3 __pthread_unregister_cancel F
> +GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 __pthread_unwind_next F
> GLIBC_2.3.3 _sys_siglist D 0x208
> GLIBC_2.3.3 gnu_dev_major F
> @@ -2218,7 +2220,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> index e835a66869..6644d3cd23 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> @@ -19,8 +19,6 @@ GLIBC_2.2.5 pthread_setconcurrency F
> GLIBC_2.2.6 __libpthread_version_placeholder F
> GLIBC_2.28 thrd_create F
> GLIBC_2.3.2 __libpthread_version_placeholder F
> -GLIBC_2.3.3 __pthread_register_cancel_defer F
> -GLIBC_2.3.3 __pthread_unregister_cancel_restore F
> GLIBC_2.3.3 pthread_attr_getaffinity_np F
> GLIBC_2.3.3 pthread_setaffinity_np F
> GLIBC_2.3.4 pthread_attr_getaffinity_np F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> index cea07a7812..93c17798fa 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
> @@ -352,6 +352,7 @@ GLIBC_2.16 __pthread_mutexattr_init F
> GLIBC_2.16 __pthread_mutexattr_settype F
> GLIBC_2.16 __pthread_once F
> GLIBC_2.16 __pthread_register_cancel F
> +GLIBC_2.16 __pthread_register_cancel_defer F
> GLIBC_2.16 __pthread_rwlock_destroy F
> GLIBC_2.16 __pthread_rwlock_init F
> GLIBC_2.16 __pthread_rwlock_rdlock F
> @@ -361,6 +362,7 @@ GLIBC_2.16 __pthread_rwlock_unlock F
> GLIBC_2.16 __pthread_rwlock_wrlock F
> GLIBC_2.16 __pthread_setspecific F
> GLIBC_2.16 __pthread_unregister_cancel F
> +GLIBC_2.16 __pthread_unregister_cancel_restore F
> GLIBC_2.16 __pthread_unwind_next F
> GLIBC_2.16 __ptsname_r_chk F
> GLIBC_2.16 __pwrite64 F
> @@ -2323,7 +2325,9 @@ GLIBC_2.34 __pthread_key_create F
> GLIBC_2.34 __pthread_mutex_lock F
> GLIBC_2.34 __pthread_mutex_unlock F
> GLIBC_2.34 __pthread_register_cancel F
> +GLIBC_2.34 __pthread_register_cancel_defer F
> GLIBC_2.34 __pthread_unregister_cancel F
> +GLIBC_2.34 __pthread_unregister_cancel_restore F
> GLIBC_2.34 __pthread_unwind_next F
> GLIBC_2.34 call_once F
> GLIBC_2.34 cnd_broadcast F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> index fc978dfbe6..c7144f2a0e 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> @@ -1,6 +1,4 @@
> GLIBC_2.16 __errno_location F
> -GLIBC_2.16 __pthread_register_cancel_defer F
> -GLIBC_2.16 __pthread_unregister_cancel_restore F
> GLIBC_2.16 pthread_attr_getaffinity_np F
> GLIBC_2.16 pthread_attr_getguardsize F
> GLIBC_2.16 pthread_attr_getstack F
>
Ok.
next prev parent reply other threads:[~2021-05-11 17:29 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-11 10:56 [PATCH 0/3] nptl: Move remaining cancellation functionality into libc Florian Weimer
2021-05-11 10:56 ` [PATCH 1/3] nptl: Move __pthread_register_cancel, __pthread_unregister_cancel to libc Florian Weimer
2021-05-11 17:27 ` Adhemerval Zanella
2021-05-11 10:56 ` [PATCH 2/3] nptl: Move __pthread_register_cancel_defer, __pthread_unregister_cancel_restore " Florian Weimer
2021-05-11 17:29 ` Adhemerval Zanella [this message]
2021-05-11 10:56 ` [PATCH 3/3] nptl: Move pthread_cancel into libc Florian Weimer
2021-05-11 17:32 ` Adhemerval Zanella
2021-05-11 17:37 ` Florian Weimer
2021-05-11 18:13 ` Adhemerval Zanella
2021-05-11 18:18 ` Florian Weimer
2021-05-11 18:36 ` Adhemerval Zanella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=81de9c88-a024-27b7-aab7-08ae38635eb9@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).