about summary refs log tree commit diff
diff options
context:
space:
mode:
authorStefan Liebler <stli@linux.vnet.ibm.com>2016-10-07 09:56:48 +0200
committerStefan Liebler <stli@linux.vnet.ibm.com>2016-10-07 10:12:48 +0200
commit314ba75e4a26f7147c757a10b07a62ff113409aa (patch)
tree9b327c5b4c305cd198d1c9dda45777f6d3bfa4bd
parent051f8be7c9466c7e53bf1f3a9d5a83c53a7ea815 (diff)
downloadglibc-314ba75e4a26f7147c757a10b07a62ff113409aa.tar.gz
glibc-314ba75e4a26f7147c757a10b07a62ff113409aa.tar.xz
glibc-314ba75e4a26f7147c757a10b07a62ff113409aa.zip
Use libc_ifunc macro for siglongjmp, longjmp in libpthread.
This patch uses the libc_ifunc macro to create already existing ifunc functions
longjmp_ifunc, siglongjmp_ifunc if HAVE_IFUNC is defined.
The s390 pt-longjmp.c includes the common pt-longjmp.c and uses strong_alias
to create the longjmp, siglongjmp symbols for glibc version 2.19.

ChangeLog:

	* nptl/pt-longjmp.c (DEFINE_LONGJMP): Use libc_ifunc macro.
	* sysdeps/unix/sysv/linux/s390/pt-longjmp.c (longjmp, siglongjmp):
	Use strong_alias to create symbols for glibc verison 2.19.
-rw-r--r--ChangeLog6
-rw-r--r--nptl/pt-longjmp.c24
-rw-r--r--sysdeps/unix/sysv/linux/s390/pt-longjmp.c4
3 files changed, 14 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index fd0ef40dfb..549acfdba4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2016-10-07  Stefan Liebler  <stli@linux.vnet.ibm.com>
 
+	* nptl/pt-longjmp.c (DEFINE_LONGJMP): Use libc_ifunc macro.
+	* sysdeps/unix/sysv/linux/s390/pt-longjmp.c (longjmp, siglongjmp):
+	Use strong_alias to create symbols for glibc verison 2.19.
+
+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>
diff --git a/nptl/pt-longjmp.c b/nptl/pt-longjmp.c
index a1cc286685..a19cd59548 100644
--- a/nptl/pt-longjmp.c
+++ b/nptl/pt-longjmp.c
@@ -32,24 +32,12 @@
 
 # if HAVE_IFUNC
 
-static __typeof (longjmp) *
-__attribute__ ((used))
-longjmp_resolve (void)
-{
-  return &__libc_longjmp;
-}
+#  undef INIT_ARCH
+#  define INIT_ARCH()
+#  define DEFINE_LONGJMP(name) libc_ifunc (name, &__libc_longjmp)
 
-#  ifdef HAVE_ASM_SET_DIRECTIVE
-#   define DEFINE_LONGJMP(name) \
-  asm (".set " #name ", longjmp_resolve\n" \
-       ".globl " #name "\n" \
-       ".type " #name ", %gnu_indirect_function");
-#  else
-#   define DEFINE_LONGJMP(name) \
-  asm (#name " = longjmp_resolve\n" \
-       ".globl " #name "\n" \
-       ".type " #name ", %gnu_indirect_function");
-#  endif
+extern __typeof(longjmp) longjmp_ifunc;
+extern __typeof(siglongjmp) siglongjmp_ifunc;
 
 # else  /* !HAVE_IFUNC */
 
@@ -66,7 +54,7 @@ longjmp_compat (jmp_buf env, int val)
 DEFINE_LONGJMP (longjmp_ifunc)
 compat_symbol (libpthread, longjmp_ifunc, longjmp, GLIBC_2_0);
 
-DEFINE_LONGJMP (siglongjmp_ifunc)
+strong_alias (longjmp_ifunc, siglongjmp_ifunc)
 compat_symbol (libpthread, siglongjmp_ifunc, siglongjmp, GLIBC_2_0);
 
 #endif
diff --git a/sysdeps/unix/sysv/linux/s390/pt-longjmp.c b/sysdeps/unix/sysv/linux/s390/pt-longjmp.c
index 10e825cb0f..2abf11218c 100644
--- a/sysdeps/unix/sysv/linux/s390/pt-longjmp.c
+++ b/sysdeps/unix/sysv/linux/s390/pt-longjmp.c
@@ -26,8 +26,8 @@
 /* In glibc release 2.19 new versions of longjmp-functions were introduced,
    but were reverted before 2.20. Thus both versions are the same function.  */
 
-DEFINE_LONGJMP (__v2longjmp)
+strong_alias (longjmp_ifunc, __v2longjmp)
 compat_symbol (libpthread, __v2longjmp, longjmp, GLIBC_2_19);
-DEFINE_LONGJMP (__v2siglongjmp)
+strong_alias (siglongjmp_ifunc, __v2siglongjmp)
 compat_symbol (libpthread, __v2siglongjmp, siglongjmp, GLIBC_2_19);
 #endif /* SHLIB_COMPAT (libpthread, GLIBC_2_19, GLIBC_2_20))  */