diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-04-21 19:49:50 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-04-21 19:49:50 +0200 |
| commit | 1d95b035c721908d3bcbbca9e8d3a5e55a24c09e (patch) | |
| tree | acc915c7a01fc6ad5572767b483cf6cfc9c9118b /sysdeps/unix/sysv/linux/arm | |
| parent | 3fec7f18bfcb7044e813a12e19c3c98eb8387e26 (diff) | |
| download | glibc-1d95b035c721908d3bcbbca9e8d3a5e55a24c09e.tar.gz glibc-1d95b035c721908d3bcbbca9e8d3a5e55a24c09e.tar.xz glibc-1d95b035c721908d3bcbbca9e8d3a5e55a24c09e.zip | |
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 <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps/unix/sysv/linux/arm')
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/be/libc.abilist | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/be/libpthread.abilist | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/le/libc.abilist | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/le/libpthread.abilist | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist index b7f575400f..b4a87c888d 100644 --- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist @@ -159,6 +159,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 @@ -491,6 +492,7 @@ GLIBC_2.4 __progname D 0x4 GLIBC_2.4 __progname_full D 0x4 GLIBC_2.4 __pthread_cleanup_routine F GLIBC_2.4 __pthread_once F +GLIBC_2.4 __pthread_unwind_next F GLIBC_2.4 __ptsname_r_chk F GLIBC_2.4 __pwrite64 F GLIBC_2.4 __rawmemchr F diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist index ca348c073a..2d92eb0367 100644 --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist @@ -59,7 +59,6 @@ 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 __res_state F GLIBC_2.4 flockfile F GLIBC_2.4 ftrylockfile F diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist index bb86b0c11a..8b5acb0a2a 100644 --- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist @@ -156,6 +156,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 @@ -488,6 +489,7 @@ GLIBC_2.4 __progname D 0x4 GLIBC_2.4 __progname_full D 0x4 GLIBC_2.4 __pthread_cleanup_routine F GLIBC_2.4 __pthread_once F +GLIBC_2.4 __pthread_unwind_next F GLIBC_2.4 __ptsname_r_chk F GLIBC_2.4 __pwrite64 F GLIBC_2.4 __rawmemchr F diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist index ca348c073a..2d92eb0367 100644 --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist @@ -59,7 +59,6 @@ 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 __res_state F GLIBC_2.4 flockfile F GLIBC_2.4 ftrylockfile F |