From 1f2e5bfe48ae7a0a74896d7f3019d976c1647e56 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 21 Apr 2021 19:49:50 +0200 Subject: nptl: Move legacy cancelation handling into libc as compat symbols This affects _pthread_cleanup_pop, _pthread_cleanup_pop_restore, _pthread_cleanup_push, _pthread_cleanup_push_defer. The symbols have been moved using scripts/move-symbol-to-libc.py. No new symbol versions are added because the symbols are turned into compatibility symbols at the same time. __pthread_cleanup_pop and __pthread_cleanup_push are added as GLIBC_PRIVATE symbols because they are also used internally, for glibc's own cancellation handling. Reviewed-by: Adhemerval Zanella --- sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist | 4 ++++ sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist | 4 ---- sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist | 4 ++++ sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist | 4 ---- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'sysdeps/unix/sysv/linux/sparc') diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist index d5a26bc288..318995dbc5 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist @@ -267,6 +267,10 @@ GLIBC_2.0 _obstack_begin_1 F GLIBC_2.0 _obstack_free F GLIBC_2.0 _obstack_memory_used F GLIBC_2.0 _obstack_newchunk F +GLIBC_2.0 _pthread_cleanup_pop F +GLIBC_2.0 _pthread_cleanup_pop_restore F +GLIBC_2.0 _pthread_cleanup_push F +GLIBC_2.0 _pthread_cleanup_push_defer F GLIBC_2.0 _res D 0x200 GLIBC_2.0 _rpc_dtablesize F GLIBC_2.0 _seterr_reply F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist index 8273920efe..9012403bb4 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist @@ -15,10 +15,6 @@ GLIBC_2.0 __pthread_mutexattr_init F GLIBC_2.0 __pthread_mutexattr_settype F GLIBC_2.0 __pthread_once F GLIBC_2.0 __pthread_setspecific F -GLIBC_2.0 _pthread_cleanup_pop F -GLIBC_2.0 _pthread_cleanup_pop_restore F -GLIBC_2.0 _pthread_cleanup_push F -GLIBC_2.0 _pthread_cleanup_push_defer F GLIBC_2.0 flockfile F GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist index 160ddc334f..c39ae6fe21 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist @@ -547,6 +547,10 @@ GLIBC_2.2 _obstack_begin_1 F GLIBC_2.2 _obstack_free F GLIBC_2.2 _obstack_memory_used F GLIBC_2.2 _obstack_newchunk F +GLIBC_2.2 _pthread_cleanup_pop F +GLIBC_2.2 _pthread_cleanup_pop_restore F +GLIBC_2.2 _pthread_cleanup_push F +GLIBC_2.2 _pthread_cleanup_push_defer F GLIBC_2.2 _res D 0x238 GLIBC_2.2 _res_hconf D 0x48 GLIBC_2.2 _rpc_dtablesize F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist index c92226a2b9..f90d9485f9 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist @@ -30,10 +30,6 @@ GLIBC_2.2 __pthread_rwlock_unlock F GLIBC_2.2 __pthread_rwlock_wrlock F GLIBC_2.2 __pthread_setspecific F GLIBC_2.2 __res_state F -GLIBC_2.2 _pthread_cleanup_pop F -GLIBC_2.2 _pthread_cleanup_pop_restore F -GLIBC_2.2 _pthread_cleanup_push F -GLIBC_2.2 _pthread_cleanup_push_defer F GLIBC_2.2 flockfile F GLIBC_2.2 ftrylockfile F GLIBC_2.2 funlockfile F -- cgit v1.2.3-70-g09d2