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/powerpc/powerpc64/be/libc.abilist | 4 ++++ sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist | 2 -- sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist | 4 ++++ sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist | 2 -- 4 files changed, 8 insertions(+), 4 deletions(-) (limited to 'sysdeps/unix/sysv/linux/powerpc/powerpc64') diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist index 2da64ea865..76f7b90366 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist @@ -2091,6 +2091,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 0x208 GLIBC_2.3.3 gnu_dev_major F @@ -2210,6 +2212,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/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist index c91f8e612d..698579e83f 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist @@ -10,9 +10,7 @@ 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 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/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist index 03a4b08bd7..40d4c446f6 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist @@ -436,6 +436,7 @@ GLIBC_2.17 __pthread_mutexattr_destroy F 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_rwlock_destroy F GLIBC_2.17 __pthread_rwlock_init F GLIBC_2.17 __pthread_rwlock_rdlock F @@ -444,6 +445,7 @@ GLIBC_2.17 __pthread_rwlock_trywrlock F 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_unwind_next F GLIBC_2.17 __ptsname_r_chk F GLIBC_2.17 __pwrite64 F @@ -2510,6 +2512,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/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist index ec54712513..78392e3aad 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist @@ -1,7 +1,5 @@ GLIBC_2.17 __errno_location F -GLIBC_2.17 __pthread_register_cancel F GLIBC_2.17 __pthread_register_cancel_defer F -GLIBC_2.17 __pthread_unregister_cancel F GLIBC_2.17 __pthread_unregister_cancel_restore F GLIBC_2.17 pthread_cancel F GLIBC_2.17 pthread_create F -- cgit 1.4.1