diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | hurd/catch-signal.c | 4 | ||||
| -rw-r--r-- | hurd/hurdfault.c | 2 | ||||
| -rw-r--r-- | include/setjmp.h | 3 | ||||
| -rw-r--r-- | libio/iolibio.h | 1 | ||||
| -rw-r--r-- | libio/ioputs.c | 1 | ||||
| -rw-r--r-- | setjmp/longjmp.c | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/sigwait.c | 2 |
8 files changed, 23 insertions, 4 deletions
@@ -396,6 +396,18 @@ _hurd_fd_error_signal): Add hidden prototype. [_HURD_FD_H_HIDDEN_DEF] (_hurd_fd_error, _hurd_fd_error_signal): Add hidden def. + * 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. * sysdeps/mach/hurd/localplt.data: New file. diff --git a/hurd/catch-signal.c b/hurd/catch-signal.c index 56ce86532d..a00ccef4fb 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 39a4522811..c42d5e739a 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]; diff --git a/include/setjmp.h b/include/setjmp.h index 263bc64b3d..682ff4b5a5 100644 --- a/include/setjmp.h +++ b/include/setjmp.h @@ -24,6 +24,9 @@ extern void __libc_siglongjmp (sigjmp_buf env, int val) extern void __libc_longjmp (sigjmp_buf env, int val) __attribute__ ((noreturn)); +libc_hidden_proto (__libc_siglongjmp) +libc_hidden_proto (__libc_longjmp) + libc_hidden_proto (_setjmp) libc_hidden_proto (__sigsetjmp) diff --git a/libio/iolibio.h b/libio/iolibio.h index 69e1c0e699..6c94fe6d62 100644 --- a/libio/iolibio.h +++ b/libio/iolibio.h @@ -41,6 +41,7 @@ extern char* _IO_gets (char*); extern void _IO_perror (const char*) __THROW; extern int _IO_printf (const char*, ...); extern int _IO_puts (const char*); +libc_hidden_proto (_IO_puts) extern int _IO_scanf (const char*, ...); extern void _IO_setbuffer (FILE *, char*, size_t) __THROW; libc_hidden_proto (_IO_setbuffer) diff --git a/libio/ioputs.c b/libio/ioputs.c index 0a80fb7148..c9967c3883 100644 --- a/libio/ioputs.c +++ b/libio/ioputs.c @@ -46,3 +46,4 @@ _IO_puts (const char *str) } weak_alias (_IO_puts, puts) +libc_hidden_def (_IO_puts) diff --git a/setjmp/longjmp.c b/setjmp/longjmp.c index a2a7065a85..0555d6d6b7 100644 --- a/setjmp/longjmp.c +++ b/setjmp/longjmp.c @@ -46,4 +46,6 @@ strong_alias (__libc_siglongjmp, __libc_longjmp) weak_alias (__libc_siglongjmp, _longjmp) weak_alias (__libc_siglongjmp, longjmp) weak_alias (__libc_siglongjmp, siglongjmp) +libc_hidden_def (__libc_longjmp) +libc_hidden_def (__libc_siglongjmp) #endif diff --git a/sysdeps/mach/hurd/sigwait.c b/sysdeps/mach/hurd/sigwait.c index ce17cce895..321ab46d14 100644 --- a/sysdeps/mach/hurd/sigwait.c +++ b/sysdeps/mach/hurd/sigwait.c @@ -59,7 +59,7 @@ __sigwait (const sigset_t *set, int *sig) handler (int sig) { assert (sig == signo); - longjmp (buf, 1); + __libc_longjmp (buf, 1); } wait = __mach_reply_port (); |