This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch roland/nptl-fork created. glibc-2.19-715-ga0999da
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 27 Jun 2014 22:37:44 -0000
- Subject: GNU C Library master sources branch roland/nptl-fork created. glibc-2.19-715-ga0999da
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, roland/nptl-fork has been created
at a0999daa1eb128fd57d2a0af0a8978e66172819f (commit)
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a0999daa1eb128fd57d2a0af0a8978e66172819f
commit a0999daa1eb128fd57d2a0af0a8978e66172819f
Author: Roland McGrath <roland@hack.frob.com>
Date: Fri Jun 27 13:08:21 2014 -0700
Clean up NPTL fork to be compat-only.
diff --git a/ChangeLog b/ChangeLog
index 54d297a..dcc5e3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2014-06-27 Roland McGrath <roland@hack.frob.com>
+ * nptl/pt-fork.c: Rewritten. Put everything under
+ [SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_20)].
+ Use IFUNC to redirect when possible.
+
+2014-06-27 Roland McGrath <roland@hack.frob.com>
+
* NEWS: NPTL is no longer an add-on!
* nptl/internaltypes.h: Moved ...
* sysdeps/nptl/internaltypes.h: ... here.
diff --git a/nptl/pt-fork.c b/nptl/pt-fork.c
index 5824094..6b7ceea 100644
--- a/nptl/pt-fork.c
+++ b/nptl/pt-fork.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2002-2014 Free Software Foundation, Inc.
+/* ABI compatibility for 'fork' symbol in libpthread ABI.
+ Copyright (C) 2002-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -17,11 +18,55 @@
<http://www.gnu.org/licenses/>. */
#include <unistd.h>
+#include <shlib-compat.h>
+/* libpthread once had its own fork, 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 __fork and fork symbols in
+ libpthread.so; so we define them using IFUNC to redirect to the libc
+ function. */
-pid_t
-__fork (void)
+#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_20)
+
+# if HAVE_IFUNC
+
+static __typeof (fork) *
+__attribute__ ((used))
+fork_resolve (void)
+{
+ return &__libc_fork;
+}
+
+# ifdef HAVE_ASM_SET_DIRECTIVE
+# define DEFINE_FORK(name) \
+ asm (".set " #name ", fork_resolve\n" \
+ ".globl " #name "\n" \
+ ".type " #name ", %gnu_indirect_function");
+# else
+# define DEFINE_FORK(name) \
+ asm (#name " = fork_resolve\n" \
+ ".globl " #name "\n" \
+ ".type " #name ", %gnu_indirect_function");
+# endif
+
+# else /* !HAVE_IFUNC */
+
+static pid_t __attribute__ ((used))
+fork_compat (void)
{
return __libc_fork ();
}
-strong_alias (__fork, fork)
+
+# define DEFINE_FORK(name) strong_alias (fork_compat, name)
+
+# endif /* HAVE_IFUNC */
+
+DEFINE_FORK (fork_ifunc)
+compat_symbol (libpthread, fork_ifunc, fork, GLIBC_2_0);
+
+DEFINE_FORK (__fork_ifunc)
+compat_symbol (libpthread, __fork_ifunc, __fork, GLIBC_2_1_2);
+
+#endif
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources