mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-01-18 12:16:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up NPTL system to be compat-only.

Browse Source
This commit is contained in:
Roland McGrath 2015-02-06 10:53:38 -08:00
parent ec2a88b3c6
commit 8c28bbc6d9
2 changed files with 44 additions and 8 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-system.c: Rewritten. Put everything under
[SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22)].
Use IFUNC to redirect when possible.
* nptl/pt-longjmp.c: Rewritten. Put everything under * nptl/pt-longjmp.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.

48
nptl/pt-system.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 2002-2015 Free Software Foundation, Inc. /* ABI compatibility for 'system' symbol 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.
@ -16,17 +17,48 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <sysdep.h> #include <shlib-compat.h>
#include "pthreadP.h"
/* libpthread once had its own 'system', 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 a
'system' symbol in libpthread.so; so we define it using IFUNC to
redirect to the libc function. */
int #if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22)
system (const char *line)
# if HAVE_IFUNC
static __typeof (system) *
__attribute__ ((used))
system_resolve (void)
{
return &__libc_system;
}
asm (".globl system_ifunc\n"
".type system_ifunc, %gnu_indirect_function");
# ifdef HAVE_ASM_SET_DIRECTIVE
asm (".set system_ifunc, system_resolve");
# else
asm ("system_ifunc = system_resolve");
# endif
# else /* !HAVE_IFUNC */
static int __attribute__ ((used))
system_compat (const char *line)
{ {
return __libc_system (line); return __libc_system (line);
} }
strong_alias (system_compat, system_ifunc)
/* __libc_system in libc.so handles cancellation. */ # endif /* HAVE_IFUNC */
LIBC_CANCEL_HANDLED ();
compat_symbol (libpthread, system_ifunc, system, GLIBC_2_0);
#endif