From patchwork Mon Jun 23 23:25:44 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Roland McGrath <roland@hack.frob.com>
X-Patchwork-Id: 1680
Received: (qmail 5955 invoked by alias); 23 Jun 2014 23:25:48 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: <mailto:libc-alpha-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 5943 invoked by uid 89); 23 Jun 2014 23:25:47 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL,
	BAYES_00 autolearn=ham version=3.3.2
X-HELO: topped-with-meat.com
MIME-Version: 1.0
From: Roland McGrath <roland@hack.frob.com>
To: "GNU C. Library" <libc-alpha@sourceware.org> 
Subject: [PATCH roland/nptl] Clean up NPTL fork to be compat-only.
Message-Id: <20140623232544.34E462C39BA@topped-with-meat.com>
Date: Mon, 23 Jun 2014 16:25:44 -0700 (PDT)
X-CMAE-Score: 0
X-CMAE-Analysis: v=2.1 cv=SvUDtp+0 c=1 sm=1 tr=0
	a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=HdKDjl3adhUA:10
	a=Z6MIti7PxpgA:10 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=mDV3o1hIAAAA:8
	a=WYGBRZLy5AX0DQXCKw0A:9 a=CjuIK1q_8ugA:10

(This is on the branch after the big change only because the file moved and
I didn't want to futz around more.  It's actually orthogonal.)  AFAIK there
was never any reason whatsoever to have fork/__fork in the libpthread.so
ABI.  We can get rid of it for the future, and optimize it marginally for
IFUNC-capable configurations.

Tested x86_64-linux-gnu.


Thanks,
Roland


	* nptl/pt-fork.c: Rewritten.  Put everything under
	[SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_20)].
	Use IFUNC to redirect when possible.

--- a/nptl/pt-fork.c
+++ b/nptl/pt-fork.c
@@ -17,11 +17,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 __vfork and vfork 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