diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-04-03 23:00:14 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-04-03 23:06:00 +0200 |
| commit | 5e17a480f83061a0dd0228b7e6415520f3136f94 (patch) | |
| tree | f926aabcfcf544f85f6d5af86ac766dfe4a4ed1b /hurd | |
| parent | 51722f4dc796fc0e071f9d0350b03a65ba5c163a (diff) | |
| download | glibc-5e17a480f83061a0dd0228b7e6415520f3136f94.tar.gz glibc-5e17a480f83061a0dd0228b7e6415520f3136f94.tar.xz glibc-5e17a480f83061a0dd0228b7e6415520f3136f94.zip | |
Revert parts of "hurd: Avoid more libc.so local PLTs"
This reverts parts of commit 82dbf555a4d41690f63b94ccb4db4bf43d873aa0.
Diffstat (limited to 'hurd')
| -rw-r--r-- | hurd/catch-signal.c | 4 | ||||
| -rw-r--r-- | hurd/hurdfault.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hurd/catch-signal.c b/hurd/catch-signal.c index a00ccef4fb..56ce86532d 100644 --- a/hurd/catch-signal.c +++ b/hurd/catch-signal.c @@ -32,7 +32,7 @@ __hurd_catch_signal (sigset_t sigset, instance calling hurd_catch_signal again would then dump core. */ sigjmp_buf buf; void throw (int signo, long int sigcode, struct sigcontext *scp) - { __libc_siglongjmp (buf, scp->sc_error ?: EGRATUITOUS); } + { siglongjmp (buf, scp->sc_error ?: EGRATUITOUS); } struct hurd_signal_preemptor preemptor = { @@ -121,7 +121,7 @@ hurd_safe_memmove (void *dest, const void *src, size_t nbytes) { jmp_buf buf; void throw (int signo, long int sigcode, struct sigcontext *scp) - { __libc_longjmp (buf, scp->sc_error ?: EGRATUITOUS); } + { longjmp (buf, scp->sc_error ?: EGRATUITOUS); } struct hurd_signal_preemptor src_preemptor = { diff --git a/hurd/hurdfault.c b/hurd/hurdfault.c index c42d5e739a..39a4522811 100644 --- a/hurd/hurdfault.c +++ b/hurd/hurdfault.c @@ -152,7 +152,7 @@ faulted (void) __libc_fatal ("BUG: unexpected fault in signal thread\n"); _hurdsig_fault_preemptor.signals = 0; - __libc_longjmp (_hurdsig_fault_env, 1); + longjmp (_hurdsig_fault_env, 1); } static char faultstack[1024]; |