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/ia64/unwind-resume.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 sysdeps/ia64/unwind-resume.c (limited to 'sysdeps/ia64') diff --git a/sysdeps/ia64/unwind-resume.c b/sysdeps/ia64/unwind-resume.c new file mode 100644 index 0000000..f8cf447 --- /dev/null +++ b/sysdeps/ia64/unwind-resume.c @@ -0,0 +1,25 @@ +/* Copyright (C) 2003-2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Jakub Jelinek . + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include + +_Unwind_Word +_Unwind_GetBSP (struct _Unwind_Context *context) +{ + return UNWIND_LINK_PTR (link (), _Unwind_GetBSP) (context); +} -- cgit v1.1