AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-09 14:50:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert parts of "hurd: Avoid more libc.so local PLTs"

Browse Source 
This reverts parts of commit 82dbf555a4.
This commit is contained in:
Samuel Thibault 2018-04-03 23:00:14 +02:00
parent 51722f4dc7
commit 5e17a480f8
6 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -521,19 +521,8 @@
_hurd_fd_error_signal): Add hidden prototype. _hurd_fd_error_signal): Add hidden prototype.
[_HURD_FD_H_HIDDEN_DEF] (_hurd_fd_error, _hurd_fd_error_signal): Add [_HURD_FD_H_HIDDEN_DEF] (_hurd_fd_error, _hurd_fd_error_signal): Add
hidden def. 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/iolibio.h (_IO_puts): New hidden prototype.
* libio/ioputs.c (_IO_puts): New hidden def. * 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. * sysdeps/mach/hurd/localplt.data: New file.
2018-04-02 Agustina Arzille <avarzille@riseup.net> 2018-04-02 Agustina Arzille <avarzille@riseup.net>

4
hurd/catch-signal.c
View File

@ -32,7 +32,7 @@ __hurd_catch_signal (sigset_t sigset,
instance calling hurd_catch_signal again would then dump core. */ instance calling hurd_catch_signal again would then dump core. */
sigjmp_buf buf; sigjmp_buf buf;
void throw (int signo, long int sigcode, struct sigcontext *scp) 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 = struct hurd_signal_preemptor preemptor =
{ {
@ -121,7 +121,7 @@ hurd_safe_memmove (void *dest, const void *src, size_t nbytes)
{ {
jmp_buf buf; jmp_buf buf;
void throw (int signo, long int sigcode, struct sigcontext *scp) 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 = struct hurd_signal_preemptor src_preemptor =
{ {

2
hurd/hurdfault.c
View File

@ -152,7 +152,7 @@ faulted (void)
__libc_fatal ("BUG: unexpected fault in signal thread\n"); __libc_fatal ("BUG: unexpected fault in signal thread\n");
_hurdsig_fault_preemptor.signals = 0; _hurdsig_fault_preemptor.signals = 0;
__libc_longjmp (_hurdsig_fault_env, 1); longjmp (_hurdsig_fault_env, 1);
} }
static char faultstack[1024]; static char faultstack[1024];

3
include/setjmp.h
View File

@ -24,9 +24,6 @@ extern void __libc_siglongjmp (sigjmp_buf env, int val)
extern void __libc_longjmp (sigjmp_buf env, int val) extern void __libc_longjmp (sigjmp_buf env, int val)
__attribute__ ((noreturn)); __attribute__ ((noreturn));
libc_hidden_proto (__libc_siglongjmp)
libc_hidden_proto (__libc_longjmp)
libc_hidden_proto (_setjmp) libc_hidden_proto (_setjmp)
libc_hidden_proto (__sigsetjmp) libc_hidden_proto (__sigsetjmp)

2
setjmp/longjmp.c
View File

@ -46,6 +46,4 @@ 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)
weak_alias (__libc_siglongjmp, siglongjmp) weak_alias (__libc_siglongjmp, siglongjmp)
libc_hidden_def (__libc_longjmp)
libc_hidden_def (__libc_siglongjmp)
#endif #endif

2
sysdeps/mach/hurd/sigwait.c
View File

@ -59,7 +59,7 @@ __sigwait (const sigset_t *set, int *sig)
handler (int sig) handler (int sig)
{ {
assert (sig == signo); assert (sig == signo);
__libc_longjmp (buf, 1); longjmp (buf, 1);
} }
wait = __mach_reply_port (); wait = __mach_reply_port ();