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 | 81dfc6694c6c67cc5084140afadc14259dca54f2 (patch) | |
tree | 00b8b7ea3662b0e4d4f5170d9f06c6e994a3f69d /nptl | |
parent | 1f2e5bfe48ae7a0a74896d7f3019d976c1647e56 (diff) | |
download | glibc-81dfc6694c6c67cc5084140afadc14259dca54f2.zip glibc-81dfc6694c6c67cc5084140afadc14259dca54f2.tar.gz glibc-81dfc6694c6c67cc5084140afadc14259dca54f2.tar.bz2 |
nptl: Remove longjmp, siglongjmp from libpthread
The definitions in libc are sufficient, the forwarders are no longer
needed.
The symbols have been moved using scripts/move-symbol-to-libc.py.
s390-linux-gnu and s390x-linux-gnu need a new version placeholder
to keep the GLIBC_2.19 symbol version in libpthread.
Tested on i386-linux-gnu, powerpc64le-linux-gnu, s390x-linux-gnu,
x86_64-linux-gnu. Built with build-many-glibcs.py.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl')
-rw-r--r-- | nptl/Makefile | 1 | ||||
-rw-r--r-- | nptl/Versions | 2 | ||||
-rw-r--r-- | nptl/pt-longjmp.c | 49 |
3 files changed, 0 insertions, 52 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 6815871..81a8f0b 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -102,7 +102,6 @@ libpthread-routines = \ old_pthread_cond_wait \ pt-cleanup \ pt-interp \ - pt-longjmp \ pthread_attr_getaffinity \ pthread_attr_getguardsize \ pthread_attr_getstack \ diff --git a/nptl/Versions b/nptl/Versions index deba8ce..67a49bd 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -140,7 +140,6 @@ libpthread { flockfile; ftrylockfile; funlockfile; - longjmp; pthread_atfork; pthread_cancel; pthread_cond_broadcast; @@ -176,7 +175,6 @@ libpthread { sem_post; sem_trywait; sem_wait; - siglongjmp; } GLIBC_2.1 { diff --git a/nptl/pt-longjmp.c b/nptl/pt-longjmp.c deleted file mode 100644 index 3f90349..0000000 --- a/nptl/pt-longjmp.c +++ /dev/null @@ -1,49 +0,0 @@ -/* ABI compatibility for 'longjmp' and 'siglongjmp' symbols in libpthread ABI. - Copyright (C) 2002-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. - - 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 - <https://www.gnu.org/licenses/>. */ - -#include <setjmp.h> -#include <shlib-compat.h> - -/* libpthread once had its own longjmp (and siglongjmp alias), though there - was no apparent reason for it. There is no use in having a separate - symbol in libpthread, but the historical ABI requires it. For static - linking, there is no need to provide anything here--the libc version - will be linked in. For shared library ABI compatibility, there must be - longjmp and siglongjmp symbols in libpthread.so. - - With an IFUNC resolver, it would be possible to avoid the indirection, - but the IFUNC resolver might run before the __libc_longjmp symbol has - been relocated, in which case the IFUNC resolver would not be able to - provide the correct address. */ - -#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22) - -static void __attribute__ ((noreturn, used)) -longjmp_compat (jmp_buf env, int val) -{ - __libc_longjmp (env, val); -} - -strong_alias (longjmp_compat, longjmp_alias) -compat_symbol (libpthread, longjmp_alias, longjmp, GLIBC_2_0); - -strong_alias (longjmp_alias, siglongjmp_alias) -compat_symbol (libpthread, siglongjmp_alias, siglongjmp, GLIBC_2_0); - -#endif |