mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-27 03:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up NPTL longjmp to be compat-only.

Browse Source
This commit is contained in:
Roland McGrath 2015-02-06 10:53:27 -08:00
parent beff1d132c
commit ec2a88b3c6
2 changed files with 54 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2015-02-06 Roland McGrath <roland@hack.frob.com> 2015-02-06 Roland McGrath <roland@hack.frob.com>
* nptl/pt-longjmp.c: Rewritten. Put everything under
[SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22)].
Use IFUNC to redirect when possible.
* nptl/pt-fork.c: Rewritten. Put everything under * nptl/pt-fork.c: Rewritten. Put everything under
[SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22)]. [SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22)].
Use IFUNC to redirect when possible. Use IFUNC to redirect when possible.

56
nptl/pt-longjmp.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 2002-2015 Free Software Foundation, Inc. /* ABI compatibility for 'longjmp' and 'siglongjmp' symbols in libpthread ABI.
Copyright (C) 2002-2015 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@ -17,12 +18,55 @@
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#include <setjmp.h> #include <setjmp.h>
#include <stdlib.h> #include <shlib-compat.h>
#include "pthreadP.h"
void /* libpthread once had its own longjmp (and siglongjmp alias), though there
longjmp (jmp_buf env, int val) 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; so we define them using
IFUNC to redirect to the libc function. */
#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22)
# if HAVE_IFUNC
static __typeof (longjmp) *
__attribute__ ((used))
longjmp_resolve (void)
{
return &__libc_longjmp;
}
# ifdef HAVE_ASM_SET_DIRECTIVE
# define DEFINE_LONGJMP(name) \
asm (".set " #name ", longjmp_resolve\n" \
".globl " #name "\n" \
".type " #name ", %gnu_indirect_function");
# else
# define DEFINE_LONGJMP(name) \
asm (#name " = longjmp_resolve\n" \
".globl " #name "\n" \
".type " #name ", %gnu_indirect_function");
# endif
# else /* !HAVE_IFUNC */
static void __attribute__ ((noreturn, used))
longjmp_compat (jmp_buf env, int val)
{ {
__libc_longjmp (env, val); __libc_longjmp (env, val);
} }
weak_alias (longjmp, siglongjmp)
# define DEFINE_LONGJMP(name) strong_alias (longjmp_compat, name)
# endif /* HAVE_IFUNC */
DEFINE_LONGJMP (longjmp_ifunc)
compat_symbol (libpthread, longjmp_ifunc, longjmp, GLIBC_2_0);
DEFINE_LONGJMP (siglongjmp_ifunc)
compat_symbol (libpthread, siglongjmp_ifunc, siglongjmp, GLIBC_2_0);
#endif