mirror of git://sourceware.org/git/glibc.git
Revert "hurd: Avoid PLTs for longjmp & siglongjmp"
This reverts commit e5f9508a32
.
This commit is contained in:
parent
c120981d72
commit
08e92e2443
|
@ -1,8 +1,5 @@
|
||||||
2018-04-05 Samuel Thibault <samuel.thibault@ens-lyon.org>
|
2018-04-05 Samuel Thibault <samuel.thibault@ens-lyon.org>
|
||||||
|
|
||||||
* include/setjmp.h (longjmp, siglongjmp): Add hidden protos.
|
|
||||||
* setjmp/longjmp.c (longjmp, siglongjmp): Add hidden defs.
|
|
||||||
* sysdeps/s390/longjmp.c (longjmp, siglongjmp): Add hidden defs.
|
|
||||||
* include/dirent.h (dirfd): Add hidden proto.
|
* include/dirent.h (dirfd): Add hidden proto.
|
||||||
* dirent/dirfd.c (dirfd): Add hidden def.
|
* dirent/dirfd.c (dirfd): Add hidden def.
|
||||||
* sysdeps/mach/hurd/dirfd.c (dirfd): Add hidden def.
|
* sysdeps/mach/hurd/dirfd.c (dirfd): Add hidden def.
|
||||||
|
|
|
@ -26,8 +26,6 @@ extern void __libc_longjmp (sigjmp_buf env, int val)
|
||||||
|
|
||||||
libc_hidden_proto (_setjmp)
|
libc_hidden_proto (_setjmp)
|
||||||
libc_hidden_proto (__sigsetjmp)
|
libc_hidden_proto (__sigsetjmp)
|
||||||
libc_hidden_proto (longjmp)
|
|
||||||
libc_hidden_proto (siglongjmp)
|
|
||||||
|
|
||||||
# if IS_IN (rtld) && !defined NO_RTLD_HIDDEN
|
# if IS_IN (rtld) && !defined NO_RTLD_HIDDEN
|
||||||
extern __typeof (__sigsetjmp) __sigsetjmp attribute_hidden;
|
extern __typeof (__sigsetjmp) __sigsetjmp attribute_hidden;
|
||||||
|
|
|
@ -45,7 +45,5 @@ __libc_siglongjmp (sigjmp_buf env, int val)
|
||||||
strong_alias (__libc_siglongjmp, __libc_longjmp)
|
strong_alias (__libc_siglongjmp, __libc_longjmp)
|
||||||
weak_alias (__libc_siglongjmp, _longjmp)
|
weak_alias (__libc_siglongjmp, _longjmp)
|
||||||
weak_alias (__libc_siglongjmp, longjmp)
|
weak_alias (__libc_siglongjmp, longjmp)
|
||||||
libc_hidden_def (longjmp)
|
|
||||||
weak_alias (__libc_siglongjmp, siglongjmp)
|
weak_alias (__libc_siglongjmp, siglongjmp)
|
||||||
libc_hidden_def (siglongjmp)
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -43,11 +43,9 @@ weak_alias (__libc_siglongjmp, __v1longjmp)
|
||||||
weak_alias (__libc_siglongjmp, __v2longjmp)
|
weak_alias (__libc_siglongjmp, __v2longjmp)
|
||||||
versioned_symbol (libc, __v1longjmp, longjmp, GLIBC_2_0);
|
versioned_symbol (libc, __v1longjmp, longjmp, GLIBC_2_0);
|
||||||
compat_symbol (libc, __v2longjmp, longjmp, GLIBC_2_19);
|
compat_symbol (libc, __v2longjmp, longjmp, GLIBC_2_19);
|
||||||
libc_hidden_def (longjmp)
|
|
||||||
|
|
||||||
weak_alias (__libc_siglongjmp, __v1siglongjmp)
|
weak_alias (__libc_siglongjmp, __v1siglongjmp)
|
||||||
weak_alias (__libc_siglongjmp, __v2siglongjmp)
|
weak_alias (__libc_siglongjmp, __v2siglongjmp)
|
||||||
versioned_symbol (libc, __v1siglongjmp, siglongjmp, GLIBC_2_0);
|
versioned_symbol (libc, __v1siglongjmp, siglongjmp, GLIBC_2_0);
|
||||||
compat_symbol (libc, __v2siglongjmp, siglongjmp, GLIBC_2_19);
|
compat_symbol (libc, __v2siglongjmp, siglongjmp, GLIBC_2_19);
|
||||||
libc_hidden_def (siglongjmp)
|
|
||||||
#endif /* SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) */
|
#endif /* SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) */
|
||||||
|
|
Loading…
Reference in New Issue