diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-04-03 00:34:31 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-04-03 00:36:33 +0000 |
| commit | 82dbf555a4d41690f63b94ccb4db4bf43d873aa0 (patch) | |
| tree | 953438aa24310b2edd266dc9a056e948d4e53c32 /hurd | |
| parent | 62108dbf615381e08369491921f388a718dd002e (diff) | |
| download | glibc-82dbf555a4d41690f63b94ccb4db4bf43d873aa0.zip glibc-82dbf555a4d41690f63b94ccb4db4bf43d873aa0.tar.gz glibc-82dbf555a4d41690f63b94ccb4db4bf43d873aa0.tar.bz2 | |
hurd: Avoid more libc.so local PLTs
* hurd/catch-signal.c (__hurd_catch_signal): Call __libc_siglongjmp
instead if siglongjmp.
(hurd_safe_memmove): Call __libc_longjmp instead of longjmp.
* hurd/hurdfault.c (faulted): Call __libc_longjmp instead of longjmp.
* include/setjmp.h (__libc_siglongjmp, __libc_longjmp): New hidden
prototypes.
* libio/iolibio.h (_IO_puts): New hidden prototype.
* libio/ioputs.c (_IO_puts): New hidden def.
* setjmp/longjmp.c (__libc_longjmp, __libc_siglongjmp): New hidden
defs.
* sysdeps/mach/hurd/sigwait.c (__sigwait): Call __libc_longjmp instead
of longjmp.
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 56ce865..a00ccef 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) - { siglongjmp (buf, scp->sc_error ?: EGRATUITOUS); } + { __libc_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) - { longjmp (buf, scp->sc_error ?: EGRATUITOUS); } + { __libc_longjmp (buf, scp->sc_error ?: EGRATUITOUS); } struct hurd_signal_preemptor src_preemptor = { diff --git a/hurd/hurdfault.c b/hurd/hurdfault.c index 39a4522..c42d5e7 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; - longjmp (_hurdsig_fault_env, 1); + __libc_longjmp (_hurdsig_fault_env, 1); } static char faultstack[1024]; |