This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH v2 8/9] Use libc_ifunc macro for vfork in libpthread.
- From: Stefan Liebler <stli at linux dot vnet dot ibm dot com>
- To: libc-alpha at sourceware dot org
- Cc: stli at linux dot vnet dot ibm dot com, fweimer at redhat dot com, murphyp at linux dot vnet dot ibm dot com, schwab at linux-m68k dot org, joseph_myers at mentor dot com
- Date: Mon, 8 Aug 2016 16:39:04 +0200
- Subject: [PATCH v2 8/9] Use libc_ifunc macro for vfork in libpthread.
- Authentication-results: sourceware.org; auth=none
- References: <1470667145-18563-1-git-send-email-stli@linux.vnet.ibm.com>
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.
---
nptl/pt-vfork.c | 22 +++++-----------------
1 file changed, 5 insertions(+), 17 deletions(-)
diff --git a/nptl/pt-vfork.c b/nptl/pt-vfork.c
index 8f4be0c..563e3ec 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
--
2.5.5