From patchwork Thu Jun 23 11:55:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 13314 Received: (qmail 3085 invoked by alias); 23 Jun 2016 11:56:18 -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 2451 invoked by uid 89); 23 Jun 2016 11:56:16 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.8 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW autolearn=no version=3.3.2 spammy=ifunc, 2.20 X-HELO: mx0a-001b2d01.pphosted.com X-IBM-Helo: d06dlp01.portsmouth.uk.ibm.com X-IBM-MailFrom: stli@linux.vnet.ibm.com X-IBM-RcptTo: libc-alpha@sourceware.org From: Stefan Liebler To: libc-alpha@sourceware.org Cc: stli@linux.vnet.ibm.com, joseph@codesourcery.com, carlos@redhat.com, munroesj@linux.vnet.ibm.com Subject: [PATCH 8/8] Use libc_ifunc macro for siglongjmp, longjmp in libpthread. Date: Thu, 23 Jun 2016 13:55:52 +0200 In-Reply-To: <1466682952-6301-1-git-send-email-stli@linux.vnet.ibm.com> References: <1466682952-6301-1-git-send-email-stli@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16062311-0036-0000-0000-000001F42D21 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16062311-0037-0000-0000-0000117757C5 Message-Id: <1466682952-6301-8-git-send-email-stli@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-06-23_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1606230130 This patch uses the libc_ifunc macro to create already existing ifunc functions longjmp_ifunc, siglongjmp_ifunc if HAVE_IFUNC is defined. The s390 pt-longjmp.c includes the common pt-longjmp.c and uses strong_alias to create the longjmp, siglongjmp symbols for glibc version 2.19. ChangeLog: * nptl/pt-longjmp.c (DEFINE_LONGJMP): Use libc_ifunc macro. * sysdeps/unix/sysv/linux/s390/pt-longjmp.c (longjmp, siglongjmp): Use strong_alias to create symbols for glibc verison 2.19. --- nptl/pt-longjmp.c | 23 +++++------------------ sysdeps/unix/sysv/linux/s390/pt-longjmp.c | 4 ++-- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/nptl/pt-longjmp.c b/nptl/pt-longjmp.c index a1cc286..7c452cb 100644 --- a/nptl/pt-longjmp.c +++ b/nptl/pt-longjmp.c @@ -32,24 +32,11 @@ # if HAVE_IFUNC -static __typeof (longjmp) * -__attribute__ ((used)) -longjmp_resolve (void) -{ - return &__libc_longjmp; -} +# define INIT_ARCH() +# define DEFINE_LONGJMP(name) libc_ifunc (name, &__libc_longjmp) -# ifdef HAVE_ASM_SET_DIRECTIVE -# define DEFINE_LONGJMP(name) \ - asm (".set " #name ", longjmp_resolve\n" \ - ".globl " #name "\n" \ - ".type " #name ", %gnu_indirect_function"); -# else -# define DEFINE_LONGJMP(name) \ - asm (#name " = longjmp_resolve\n" \ - ".globl " #name "\n" \ - ".type " #name ", %gnu_indirect_function"); -# endif +extern __typeof(longjmp) longjmp_ifunc; +extern __typeof(siglongjmp) siglongjmp_ifunc; # else /* !HAVE_IFUNC */ @@ -66,7 +53,7 @@ longjmp_compat (jmp_buf env, int val) DEFINE_LONGJMP (longjmp_ifunc) compat_symbol (libpthread, longjmp_ifunc, longjmp, GLIBC_2_0); -DEFINE_LONGJMP (siglongjmp_ifunc) +strong_alias (longjmp_ifunc, siglongjmp_ifunc) compat_symbol (libpthread, siglongjmp_ifunc, siglongjmp, GLIBC_2_0); #endif diff --git a/sysdeps/unix/sysv/linux/s390/pt-longjmp.c b/sysdeps/unix/sysv/linux/s390/pt-longjmp.c index 10e825c..2abf112 100644 --- a/sysdeps/unix/sysv/linux/s390/pt-longjmp.c +++ b/sysdeps/unix/sysv/linux/s390/pt-longjmp.c @@ -26,8 +26,8 @@ /* In glibc release 2.19 new versions of longjmp-functions were introduced, but were reverted before 2.20. Thus both versions are the same function. */ -DEFINE_LONGJMP (__v2longjmp) +strong_alias (longjmp_ifunc, __v2longjmp) compat_symbol (libpthread, __v2longjmp, longjmp, GLIBC_2_19); -DEFINE_LONGJMP (__v2siglongjmp) +strong_alias (siglongjmp_ifunc, __v2siglongjmp) compat_symbol (libpthread, __v2siglongjmp, siglongjmp, GLIBC_2_19); #endif /* SHLIB_COMPAT (libpthread, GLIBC_2_19, GLIBC_2_20)) */