This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.27.9000-285-g5e17a48
- From: sthibaul at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 3 Apr 2018 21:06:11 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.27.9000-285-g5e17a48
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 5e17a480f83061a0dd0228b7e6415520f3136f94 (commit)
via 51722f4dc796fc0e071f9d0350b03a65ba5c163a (commit)
from f2652643d7234c08205b75f527191c2e2b35251f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5e17a480f83061a0dd0228b7e6415520f3136f94
commit 5e17a480f83061a0dd0228b7e6415520f3136f94
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue Apr 3 23:00:14 2018 +0200
Revert parts of "hurd: Avoid more libc.so local PLTs"
This reverts parts of commit 82dbf555a4d41690f63b94ccb4db4bf43d873aa0.
diff --git a/ChangeLog b/ChangeLog
index d2dabfb..dd78bf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -521,19 +521,8 @@
_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.
2018-04-02 Agustina Arzille <avarzille@riseup.net>
diff --git a/hurd/catch-signal.c b/hurd/catch-signal.c
index a00ccef..56ce865 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 c42d5e7..39a4522 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];
diff --git a/include/setjmp.h b/include/setjmp.h
index 682ff4b..263bc64 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -24,9 +24,6 @@ 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/setjmp/longjmp.c b/setjmp/longjmp.c
index 0555d6d..a2a7065 100644
--- a/setjmp/longjmp.c
+++ b/setjmp/longjmp.c
@@ -46,6 +46,4 @@ 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 321ab46..ce17cce 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);
- __libc_longjmp (buf, 1);
+ longjmp (buf, 1);
}
wait = __mach_reply_port ();
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=51722f4dc796fc0e071f9d0350b03a65ba5c163a
commit 51722f4dc796fc0e071f9d0350b03a65ba5c163a
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue Apr 3 22:59:17 2018 +0200
Revert "s390x: Fix hidden aliases"
This reverts commit 811836a411a1c97a0e70e7f096e57f316dc19c72.
diff --git a/ChangeLog b/ChangeLog
index 5d3bf33..d2dabfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -533,8 +533,6 @@
defs.
* sysdeps/mach/hurd/sigwait.c (__sigwait): Call __libc_longjmp instead
of longjmp.
- * sysdeps/s390/longjmp.c (__libc_longjmp, __libc_siglongjmp): New
- hidden defs.
* sysdeps/mach/hurd/localplt.data: New file.
diff --git a/sysdeps/s390/longjmp.c b/sysdeps/s390/longjmp.c
index e543415..e61cdba 100644
--- a/sysdeps/s390/longjmp.c
+++ b/sysdeps/s390/longjmp.c
@@ -33,8 +33,6 @@
but were reverted before 2.20. Thus both versions are the same function. */
strong_alias (__libc_siglongjmp, __libc_longjmp)
-libc_hidden_def (__libc_longjmp)
-libc_hidden_def (__libc_siglongjmp)
weak_alias (__libc_siglongjmp, __v1_longjmp)
weak_alias (__libc_siglongjmp, __v2_longjmp)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 13 -------------
hurd/catch-signal.c | 4 ++--
hurd/hurdfault.c | 2 +-
include/setjmp.h | 3 ---
setjmp/longjmp.c | 2 --
sysdeps/mach/hurd/sigwait.c | 2 +-
sysdeps/s390/longjmp.c | 2 --
7 files changed, 4 insertions(+), 24 deletions(-)
hooks/post-receive
--
GNU C Library master sources