diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-04-05 09:38:58 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-04-05 09:38:58 +0200 |
| commit | 08e92e2443a6ca4cfd45b87e22bef3454f369752 (patch) | |
| tree | 5113bab4d368f6e8c990bdf53d143a34e6a4b2b0 | |
| parent | c120981d72faa4a07a31d92f015353b12d72d992 (diff) | |
| download | glibc-08e92e2443a6ca4cfd45b87e22bef3454f369752.tar.gz glibc-08e92e2443a6ca4cfd45b87e22bef3454f369752.tar.xz glibc-08e92e2443a6ca4cfd45b87e22bef3454f369752.zip | |
Revert "hurd: Avoid PLTs for longjmp & siglongjmp"
This reverts commit e5f9508a32426b7c3948dc741d84355071ed9539.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | include/setjmp.h | 2 | ||||
| -rw-r--r-- | setjmp/longjmp.c | 2 | ||||
| -rw-r--r-- | sysdeps/s390/longjmp.c | 2 |
4 files changed, 0 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 73ce5991f3..af6e325aaa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,5 @@ 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. * dirent/dirfd.c (dirfd): Add hidden def. * sysdeps/mach/hurd/dirfd.c (dirfd): Add hidden def. diff --git a/include/setjmp.h b/include/setjmp.h index ed582516c9..263bc64b3d 100644 --- a/include/setjmp.h +++ b/include/setjmp.h @@ -26,8 +26,6 @@ extern void __libc_longjmp (sigjmp_buf env, int val) libc_hidden_proto (_setjmp) libc_hidden_proto (__sigsetjmp) -libc_hidden_proto (longjmp) -libc_hidden_proto (siglongjmp) # if IS_IN (rtld) && !defined NO_RTLD_HIDDEN extern __typeof (__sigsetjmp) __sigsetjmp attribute_hidden; diff --git a/setjmp/longjmp.c b/setjmp/longjmp.c index 72d43f45df..a2a7065a85 100644 --- a/setjmp/longjmp.c +++ b/setjmp/longjmp.c @@ -45,7 +45,5 @@ __libc_siglongjmp (sigjmp_buf env, int val) strong_alias (__libc_siglongjmp, __libc_longjmp) weak_alias (__libc_siglongjmp, _longjmp) weak_alias (__libc_siglongjmp, longjmp) -libc_hidden_def (longjmp) weak_alias (__libc_siglongjmp, siglongjmp) -libc_hidden_def (siglongjmp) #endif diff --git a/sysdeps/s390/longjmp.c b/sysdeps/s390/longjmp.c index 1064647ee0..e61cdba2a3 100644 --- a/sysdeps/s390/longjmp.c +++ b/sysdeps/s390/longjmp.c @@ -43,11 +43,9 @@ weak_alias (__libc_siglongjmp, __v1longjmp) weak_alias (__libc_siglongjmp, __v2longjmp) versioned_symbol (libc, __v1longjmp, longjmp, GLIBC_2_0); compat_symbol (libc, __v2longjmp, longjmp, GLIBC_2_19); -libc_hidden_def (longjmp) weak_alias (__libc_siglongjmp, __v1siglongjmp) weak_alias (__libc_siglongjmp, __v2siglongjmp) versioned_symbol (libc, __v1siglongjmp, siglongjmp, GLIBC_2_0); compat_symbol (libc, __v2siglongjmp, siglongjmp, GLIBC_2_19); -libc_hidden_def (siglongjmp) #endif /* SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) */ |