From patchwork Tue Apr 3 21:07:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 894782 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-91381-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="rjVEEBGY"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40G1s96Xy2z9s0p for ; Wed, 4 Apr 2018 07:08:13 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=EXW+I+wTC6GmxF2guhQJ8I7ED8YFcoV KfE2M0rDgpCBfp4nwWKMDeP1QPqLXT0qyJQWL4PJ1wFibKF9hpa7dy7z3tT9aos8 gJXm2OvU3QSC9PQA9Ru38relzr83f4yRqqgxC9MTJ/D4QPYXOjYK5Hw39D/bP1bz RVcMaGhfV+cA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=uTxKvFF2/sYy4RWWPg6QREgO3pE=; b=rjVEE BGYUiWf00Qk/Sy2K4CLC1xPHavcQH2bUukr8p2X78alxeHfCclnt2m8jZ/hYoj3j UesNxXOByuzsPz0m2sZYYtNRiXVwdzfe2WUefAemfXqKgHOr85EN9QiavuJGuTI0 t207FCDML4KW2gtvZpx3bRzb5Pki4cfw39LiUo= Received: (qmail 55236 invoked by alias); 3 Apr 2018 21:07:52 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 55087 invoked by uid 89); 3 Apr 2018 21:07:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy= X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd,commited 1/2] Revert "s390x: Fix hidden aliases" Date: Tue, 3 Apr 2018 23:07:43 +0200 Message-Id: <20180403210744.10927-2-samuel.thibault@ens-lyon.org> In-Reply-To: <20180403210744.10927-1-samuel.thibault@ens-lyon.org> References: <20180403210744.10927-1-samuel.thibault@ens-lyon.org> This reverts commit 811836a411a1c97a0e70e7f096e57f316dc19c72. --- ChangeLog | 2 -- sysdeps/s390/longjmp.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5d3bf33698..d2dabfb3f5 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 e543415df0..e61cdba2a3 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) From patchwork Tue Apr 3 21:07:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 894781 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-91380-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="vHLpbJfh"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40G1s21pN5z9s0p for ; Wed, 4 Apr 2018 07:08:06 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=BBMwMC6YYaJLOPPo8jCOhApFQp0cUjd K5tPyUMSdBdCq7jKl3R96Oj5MvZ57jJapjSkWrJ8BOgmmR+KzNr1sul+7kf+6ms1 N65buYD8CpxgPNaN88Xppl9RmL8IUVa9tF2AroRFjPMhLZ2JnY0slE+fK5g+nV5r Ct1IQQgeJAwA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=zPgR6EYFrJMADHNjpWkEj6bWdps=; b=vHLpb JfhfqLYOFn4YRo843VzziEn8fZbJCX4JCvVZJF2l8cgVEEhwRsNY1E/Q4Z+K4KQU O3Yw4mNlaRdj/FsgR5CmIa+qt5urDKZ8y6IDelZAh8IfOw+KHo2BKGJB+F63YTkl Vs1IgnvohqE0gf9DTpVPzPuHuRdVOjaLI1S00Q= Received: (qmail 55128 invoked by alias); 3 Apr 2018 21:07:52 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 55098 invoked by uid 89); 3 Apr 2018 21:07:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy= X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd, commited 2/2] Revert parts of "hurd: Avoid more libc.so local PLTs" Date: Tue, 3 Apr 2018 23:07:44 +0200 Message-Id: <20180403210744.10927-3-samuel.thibault@ens-lyon.org> In-Reply-To: <20180403210744.10927-1-samuel.thibault@ens-lyon.org> References: <20180403210744.10927-1-samuel.thibault@ens-lyon.org> This reverts parts of commit 82dbf555a4d41690f63b94ccb4db4bf43d873aa0. --- ChangeLog | 11 ----------- hurd/catch-signal.c | 4 ++-- hurd/hurdfault.c | 2 +- include/setjmp.h | 3 --- setjmp/longjmp.c | 2 -- sysdeps/mach/hurd/sigwait.c | 2 +- 6 files changed, 4 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2dabfb3f5..dd78bf691a 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 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]; diff --git a/include/setjmp.h b/include/setjmp.h index 682ff4b5a5..263bc64b3d 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 0555d6d6b7..a2a7065a85 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 321ab46d14..ce17cce895 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 ();