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 /nptl/nptl-init.c | |
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 'nptl/nptl-init.c')
-rw-r--r-- | nptl/nptl-init.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c index b683adb698..124799679b 100644 --- a/nptl/nptl-init.c +++ b/nptl/nptl-init.c @@ -94,7 +94,6 @@ static const struct pthread_functions pthread_functions = .ptr___pthread_getspecific = __pthread_getspecific, .ptr___pthread_setspecific = __pthread_setspecific, .ptr_nthreads = &__nptl_nthreads, - .ptr___pthread_unwind = &__pthread_unwind, .ptr__nptl_deallocate_tsd = __nptl_deallocate_tsd, .ptr__nptl_setxid = __nptl_setxid, .ptr_set_robust = __nptl_set_robust |