From patchwork Thu Apr 5 07:39:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 26611 Received: (qmail 33891 invoked by alias); 5 Apr 2018 07:39:20 -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 33823 invoked by uid 89); 5 Apr 2018 07:39:20 -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] Revert "hurd: Avoid PLTs for longjmp & siglongjmp" Date: Thu, 5 Apr 2018 09:39:14 +0200 Message-Id: <20180405073914.1243-1-samuel.thibault@ens-lyon.org> This reverts commit e5f9508a32426b7c3948dc741d84355071ed9539. --- ChangeLog | 3 --- include/setjmp.h | 2 -- setjmp/longjmp.c | 2 -- sysdeps/s390/longjmp.c | 2 -- 4 files changed, 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 73ce5991f3..af6e325aaa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,5 @@ 2018-04-05 Samuel Thibault - * include/setjmp.h (longjmp, siglongjmp): Add hidden protos. - * setjmp/longjmp.c (longjmp, siglongjmp): Add hidden defs. - * sysdeps/s390/longjmp.c (longjmp, siglongjmp): Add hidden defs. * include/dirent.h (dirfd): Add hidden proto. * dirent/dirfd.c (dirfd): Add hidden def. * sysdeps/mach/hurd/dirfd.c (dirfd): Add hidden def. diff --git a/include/setjmp.h b/include/setjmp.h index ed582516c9..263bc64b3d 100644 --- a/include/setjmp.h +++ b/include/setjmp.h @@ -26,8 +26,6 @@ extern void __libc_longjmp (sigjmp_buf env, int val) libc_hidden_proto (_setjmp) libc_hidden_proto (__sigsetjmp) -libc_hidden_proto (longjmp) -libc_hidden_proto (siglongjmp) # if IS_IN (rtld) && !defined NO_RTLD_HIDDEN extern __typeof (__sigsetjmp) __sigsetjmp attribute_hidden; diff --git a/setjmp/longjmp.c b/setjmp/longjmp.c index 72d43f45df..a2a7065a85 100644 --- a/setjmp/longjmp.c +++ b/setjmp/longjmp.c @@ -45,7 +45,5 @@ __libc_siglongjmp (sigjmp_buf env, int val) strong_alias (__libc_siglongjmp, __libc_longjmp) weak_alias (__libc_siglongjmp, _longjmp) weak_alias (__libc_siglongjmp, longjmp) -libc_hidden_def (longjmp) weak_alias (__libc_siglongjmp, siglongjmp) -libc_hidden_def (siglongjmp) #endif diff --git a/sysdeps/s390/longjmp.c b/sysdeps/s390/longjmp.c index 1064647ee0..e61cdba2a3 100644 --- a/sysdeps/s390/longjmp.c +++ b/sysdeps/s390/longjmp.c @@ -43,11 +43,9 @@ weak_alias (__libc_siglongjmp, __v1longjmp) weak_alias (__libc_siglongjmp, __v2longjmp) versioned_symbol (libc, __v1longjmp, longjmp, GLIBC_2_0); compat_symbol (libc, __v2longjmp, longjmp, GLIBC_2_19); -libc_hidden_def (longjmp) weak_alias (__libc_siglongjmp, __v1siglongjmp) weak_alias (__libc_siglongjmp, __v2siglongjmp) versioned_symbol (libc, __v1siglongjmp, siglongjmp, GLIBC_2_0); compat_symbol (libc, __v2siglongjmp, siglongjmp, GLIBC_2_19); -libc_hidden_def (siglongjmp) #endif /* SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) */