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/powerpc/longjmp.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'sysdeps/powerpc/longjmp.c') diff --git a/sysdeps/powerpc/longjmp.c b/sysdeps/powerpc/longjmp.c index 7332433..57ee561 100644 --- a/sysdeps/powerpc/longjmp.c +++ b/sysdeps/powerpc/longjmp.c @@ -48,13 +48,9 @@ __vmx__libc_siglongjmp (sigjmp_buf env, int val) strong_alias (__vmx__libc_siglongjmp, __vmx__libc_longjmp) libc_hidden_def (__vmx__libc_longjmp) -weak_alias (__vmx__libc_siglongjmp, __vmx_longjmp) -weak_alias (__vmx__libc_siglongjmp, __vmxlongjmp) -weak_alias (__vmx__libc_siglongjmp, __vmxsiglongjmp) - -default_symbol_version (__vmx__libc_longjmp, __libc_longjmp, GLIBC_PRIVATE); -default_symbol_version (__vmx__libc_siglongjmp, __libc_siglongjmp, GLIBC_PRIVATE); -versioned_symbol (libc, __vmx_longjmp, _longjmp, GLIBC_2_3_4); -versioned_symbol (libc, __vmxlongjmp, longjmp, GLIBC_2_3_4); -versioned_symbol (libc, __vmxsiglongjmp, siglongjmp, GLIBC_2_3_4); +strong_alias (__vmx__libc_longjmp, __libc_longjmp) +strong_alias (__vmx__libc_siglongjmp, __libc_siglongjmp) +versioned_symbol (libc, __vmx__libc_siglongjmp, _longjmp, GLIBC_2_3_4); +versioned_symbol (libc, __vmx__libc_siglongjmp, longjmp, GLIBC_2_3_4); +versioned_symbol (libc, __vmx__libc_siglongjmp, siglongjmp, GLIBC_2_3_4); -- cgit v1.1