From 3ec8b1c7a921baa673ad9a33e0c63b4571915caa Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 11 May 2021 11:38:46 +0200 Subject: nptl: Move __pthread_register_cancel, __pthread_unregister_cancel to libc The symbols were moved using scripts/move-symbol-to-libc.py. Also clean up some unwinder linking leftover in the same spot in nptl/pthreadP.h. Reviewed-by: Adhemerval Zanella --- sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist | 4 ++++ sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist | 2 -- sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'sysdeps/unix/sysv/linux/mips/mips32') diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist index 44ace717cc..d8c7c301f3 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist @@ -2200,6 +2200,8 @@ GLIBC_2.3.2 pthread_cond_timedwait F 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_unregister_cancel 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 @@ -2300,6 +2302,8 @@ GLIBC_2.34 __pthread_cleanup_routine F 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_unregister_cancel 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 4695968c1c..878d76db93 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist @@ -13,9 +13,7 @@ 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 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_setaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist index 3974be5699..a8e1ce6aed 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist @@ -2198,6 +2198,8 @@ GLIBC_2.3.2 pthread_cond_timedwait F 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_unregister_cancel 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 @@ -2298,6 +2300,8 @@ GLIBC_2.34 __pthread_cleanup_routine F 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_unregister_cancel F GLIBC_2.34 __pthread_unwind_next F GLIBC_2.34 call_once F GLIBC_2.34 cnd_broadcast F -- cgit 1.4.1