From: Stefan Liebler <stli@linux.vnet.ibm.com>
Date: Fri, 7 Oct 2016 07:56:47 +0000 (+0200)
Subject: Use libc_ifunc macro for vfork in libpthread.
X-Git-Tag: glibc-2.25~426
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=051f8be7c9466c7e53bf1f3a9d5a83c53a7ea815;p=thirdparty%2Fglibc.git

Use libc_ifunc macro for vfork in libpthread.

This patch uses the libc_ifunc macro to create already existing ifunc functions
vfork_ifunc and __vfork_ifunc if HAVE_IFUNC is defined.

ChangeLog:

	* nptl/pt-vfork.c (DEFINE_VFORK): Use libc_ifunc macro.
---

diff --git a/ChangeLog b/ChangeLog
index 4adcebd6908..fd0ef40dfb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-10-07  Stefan Liebler  <stli@linux.vnet.ibm.com>
+
+	* nptl/pt-vfork.c (DEFINE_VFORK): Use libc_ifunc macro.
+
 2016-10-07  Stefan Liebler  <stli@linux.vnet.ibm.com>
 
 	* nptl/pt-system.c (system_ifunc): Use libc_ifunc macro.
diff --git a/nptl/pt-vfork.c b/nptl/pt-vfork.c
index 8f4be0c4b3b..563e3ec12fb 100644
--- a/nptl/pt-vfork.c
+++ b/nptl/pt-vfork.c
@@ -46,32 +46,20 @@
 
 extern __typeof (vfork) __libc_vfork;   /* Defined in libc.  */
 
-static __typeof (vfork) *
-__attribute__ ((used))
-vfork_resolve (void)
-{
-  return &__libc_vfork;
-}
+# undef INIT_ARCH
+# define INIT_ARCH()
+# define DEFINE_VFORK(name) libc_ifunc (name, &__libc_vfork)
 
-# ifdef HAVE_ASM_SET_DIRECTIVE
-#  define DEFINE_VFORK(name) \
-  asm (".set " #name ", vfork_resolve\n" \
-       ".globl " #name "\n" \
-       ".type " #name ", %gnu_indirect_function");
-# else
-#  define DEFINE_VFORK(name) \
-  asm (#name " = vfork_resolve\n" \
-       ".globl " #name "\n" \
-       ".type " #name ", %gnu_indirect_function");
-# endif
 #endif
 
 #if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_20)
+extern __typeof(vfork) vfork_ifunc;
 DEFINE_VFORK (vfork_ifunc)
 compat_symbol (libpthread, vfork_ifunc, vfork, GLIBC_2_0);
 #endif
 
 #if SHLIB_COMPAT (libpthread, GLIBC_2_1_2, GLIBC_2_20)
+extern __typeof(vfork) __vfork_ifunc;
 DEFINE_VFORK (__vfork_ifunc)
 compat_symbol (libpthread, __vfork_ifunc, __vfork, GLIBC_2_1_2);
 #endif