forked from pool/glibc
121 lines
4.4 KiB
Diff
121 lines
4.4 KiB
Diff
|
2017-08-09 Andreas Schwab <schwab@suse.de>
|
||
|
|
|
||
|
|
[BZ #21041]
|
||
|
|
* sysdeps/unix/sysv/linux/s390/pt-longjmp.c: Update reference to
|
||
|
|
renamed alias.
|
||
|
|
|
||
|
|
2017-08-08 Andreas Schwab <schwab@suse.de>
|
||
|
|
|
||
|
|
[BZ #21041]
|
||
|
|
* nptl/pt-longjmp.c (longjmp, siglongjmp): Don't use IFUNC resolver.
|
||
|
|
* nptl/pt-system.c (system): Likewise.
|
||
|
|
|
||
|
|
Index: glibc-2.26/nptl/pt-longjmp.c
|
||
|
|
===================================================================
|
||
|
|
--- glibc-2.26.orig/nptl/pt-longjmp.c
|
||
|
|
+++ glibc-2.26/nptl/pt-longjmp.c
|
||
|
|
@@ -25,21 +25,14 @@
|
||
|
|
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
|
||
|
|
- longjmp and siglongjmp symbols in libpthread.so; so we define them using
|
||
|
|
- IFUNC to redirect to the libc function. */
|
||
|
|
+ longjmp and siglongjmp symbols in libpthread.so.
|
||
|
|
|
||
|
|
-#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22)
|
||
|
|
-
|
||
|
|
-# if HAVE_IFUNC
|
||
|
|
-
|
||
|
|
-# undef INIT_ARCH
|
||
|
|
-# define INIT_ARCH()
|
||
|
|
-# define DEFINE_LONGJMP(name) libc_ifunc (name, &__libc_longjmp)
|
||
|
|
-
|
||
|
|
-extern __typeof(longjmp) longjmp_ifunc;
|
||
|
|
-extern __typeof(siglongjmp) siglongjmp_ifunc;
|
||
|
|
+ With an IFUNC resolver, it would be possible to avoid the indirection,
|
||
|
|
+ but the IFUNC resolver might run before the __libc_longjmp symbol has
|
||
|
|
+ been relocated, in which case the IFUNC resolver would not be able to
|
||
|
|
+ provide the correct address. */
|
||
|
|
|
||
|
|
-# else /* !HAVE_IFUNC */
|
||
|
|
+#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22)
|
||
|
|
|
||
|
|
static void __attribute__ ((noreturn, used))
|
||
|
|
longjmp_compat (jmp_buf env, int val)
|
||
|
|
@@ -47,14 +40,10 @@ longjmp_compat (jmp_buf env, int val)
|
||
|
|
__libc_longjmp (env, val);
|
||
|
|
}
|
||
|
|
|
||
|
|
-# define DEFINE_LONGJMP(name) strong_alias (longjmp_compat, name)
|
||
|
|
-
|
||
|
|
-# endif /* HAVE_IFUNC */
|
||
|
|
-
|
||
|
|
-DEFINE_LONGJMP (longjmp_ifunc)
|
||
|
|
-compat_symbol (libpthread, longjmp_ifunc, longjmp, GLIBC_2_0);
|
||
|
|
+strong_alias (longjmp_compat, longjmp_alias)
|
||
|
|
+compat_symbol (libpthread, longjmp_alias, longjmp, GLIBC_2_0);
|
||
|
|
|
||
|
|
-strong_alias (longjmp_ifunc, siglongjmp_ifunc)
|
||
|
|
-compat_symbol (libpthread, siglongjmp_ifunc, siglongjmp, GLIBC_2_0);
|
||
|
|
+strong_alias (longjmp_alias, siglongjmp_alias)
|
||
|
|
+compat_symbol (libpthread, siglongjmp_alias, siglongjmp, GLIBC_2_0);
|
||
|
|
|
||
|
|
#endif
|
||
|
|
Index: glibc-2.26/nptl/pt-system.c
|
||
|
|
===================================================================
|
||
|
|
--- glibc-2.26.orig/nptl/pt-system.c
|
||
|
|
+++ glibc-2.26/nptl/pt-system.c
|
||
|
|
@@ -25,29 +25,21 @@
|
||
|
|
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 a
|
||
|
|
- 'system' symbol in libpthread.so; so we define it using IFUNC to
|
||
|
|
- redirect to the libc function. */
|
||
|
|
+ 'system' symbol in libpthread.so.
|
||
|
|
|
||
|
|
-#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22)
|
||
|
|
-
|
||
|
|
-# if HAVE_IFUNC
|
||
|
|
-
|
||
|
|
-extern __typeof(system) system_ifunc;
|
||
|
|
-# undef INIT_ARCH
|
||
|
|
-# define INIT_ARCH()
|
||
|
|
-libc_ifunc (system_ifunc, &__libc_system)
|
||
|
|
+ With an IFUNC resolver, it would be possible to avoid the indirection,
|
||
|
|
+ but the IFUNC resolver might run before the __libc_system symbol has
|
||
|
|
+ been relocated, in which case the IFUNC resolver would not be able to
|
||
|
|
+ provide the correct address. */
|
||
|
|
|
||
|
|
-# else /* !HAVE_IFUNC */
|
||
|
|
+#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22)
|
||
|
|
|
||
|
|
static int __attribute__ ((used))
|
||
|
|
system_compat (const char *line)
|
||
|
|
{
|
||
|
|
return __libc_system (line);
|
||
|
|
}
|
||
|
|
-strong_alias (system_compat, system_ifunc)
|
||
|
|
-
|
||
|
|
-# endif /* HAVE_IFUNC */
|
||
|
|
-
|
||
|
|
-compat_symbol (libpthread, system_ifunc, system, GLIBC_2_0);
|
||
|
|
+strong_alias (system_compat, system_alias)
|
||
|
|
+compat_symbol (libpthread, system_alias, system, GLIBC_2_0);
|
||
|
|
|
||
|
|
#endif
|
||
|
|
Index: glibc-2.26/sysdeps/unix/sysv/linux/s390/pt-longjmp.c
|
||
|
|
===================================================================
|
||
|
|
--- glibc-2.26.orig/sysdeps/unix/sysv/linux/s390/pt-longjmp.c
|
||
|
|
+++ glibc-2.26/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. */
|
||
|
|
|
||
|
|
-strong_alias (longjmp_ifunc, __v2longjmp)
|
||
|
|
+strong_alias (longjmp_alias, __v2longjmp)
|
||
|
|
compat_symbol (libpthread, __v2longjmp, longjmp, GLIBC_2_19);
|
||
|
|
-strong_alias (siglongjmp_ifunc, __v2siglongjmp)
|
||
|
|
+strong_alias (siglongjmp_alias, __v2siglongjmp)
|
||
|
|
compat_symbol (libpthread, __v2siglongjmp, siglongjmp, GLIBC_2_19);
|
||
|
|
#endif /* SHLIB_COMPAT (libpthread, GLIBC_2_19, GLIBC_2_20)) */
|