From 1d95b035c721908d3bcbbca9e8d3a5e55a24c09e Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 21 Apr 2021 19:49:50 +0200 Subject: nptl: Move __pthread_unwind_next into libc It's necessary to stub out __libc_disable_asynccancel and __libc_enable_asynccancel via rtld-stubbed-symbols because the new direct references to the unwinder result in symbol conflicts when the rtld exception handling from libc is linked in during the construction of librtld.map. unwind-forcedunwind.c is merged into unwind-resume.c. libc now needs the functions that were previously only used in libpthread. The GLIBC_PRIVATE exports of __libc_longjmp and __libc_siglongjmp are no longer needed, so switch them to hidden symbols. The symbol __pthread_unwind_next has been moved using scripts/move-symbol-to-libc.py. Reviewed-by: Adhemerva Zanella --- sysdeps/unix/sysv/linux/csky/libc.abilist | 2 ++ sysdeps/unix/sysv/linux/csky/libpthread.abilist | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'sysdeps/unix/sysv/linux/csky') diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist index 311a9ec..5ad9646 100644 --- a/sysdeps/unix/sysv/linux/csky/libc.abilist +++ b/sysdeps/unix/sysv/linux/csky/libc.abilist @@ -333,6 +333,7 @@ GLIBC_2.29 __progname D 0x4 GLIBC_2.29 __progname_full D 0x4 GLIBC_2.29 __pthread_cleanup_routine F GLIBC_2.29 __pthread_once F +GLIBC_2.29 __pthread_unwind_next F GLIBC_2.29 __ptsname_r_chk F GLIBC_2.29 __pwrite64 F GLIBC_2.29 __rawmemchr F @@ -2128,6 +2129,7 @@ GLIBC_2.33 stat64 F GLIBC_2.34 __libc_start_main F GLIBC_2.34 __pthread_cleanup_routine F GLIBC_2.34 __pthread_once F +GLIBC_2.34 __pthread_unwind_next F GLIBC_2.34 pthread_kill F GLIBC_2.34 pthread_mutex_consistent F GLIBC_2.34 pthread_once F diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist index 00b134f..f2eed97 100644 --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist @@ -25,7 +25,6 @@ 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 __res_state F GLIBC_2.29 call_once F GLIBC_2.29 cnd_broadcast F -- cgit v1.1