From patchwork Thu Feb 12 09:04:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 439136 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 61A3E140079 for ; Thu, 12 Feb 2015 20:12:32 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:to:from:subject:date:message-id:mime-version :content-type; q=dns; s=default; b=KQjgRTYtRBxk7xWBurKxntzdgklY8 HX9sggClPYgLxUtE/NHmzi3GL7VDexmi6DfE7tJ5pgubP31lBvU6yMbFeRnv+NM7 z7p/wjuM8/SHUd2KOw70uG14A+5lVN42lliRY1Sn8/mbnvKCkavC/PszgRvRBYY9 yC+GsvtrT34nJI= 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:to:from:subject:date:message-id:mime-version :content-type; s=default; bh=8ZuuhldP8tYWy7Asl47VcVJ+Vwo=; b=T5/ kqNb0o6jdhH5pMh8Bc1gsXzMm6zMWSZYTWWS+B6OVCra7Yt7VchhC8IQQyuQj8ly Gli4OxRn5lo6O9sh0UCiM5sBy76wBItmFPoJgXnFUNpqbQPXFpv0nAPLTL9s5C5U xHdoQXLXoSt/NY/iGpIS9Yt4fZ7nlw2LSgXu57qc= Received: (qmail 12861 invoked by alias); 12 Feb 2015 09:04:35 -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 12843 invoked by uid 89); 12 Feb 2015 09:04:34 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: plane.gmane.org To: libc-alpha@sourceware.org From: Stefan Liebler Subject: [PATCH] S390: Build failure due to nptl/pt-longjmp.c changes. Date: Thu, 12 Feb 2015 10:04:10 +0100 Lines: 66 Message-ID: Mime-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 Hi, i get a build-failure on s390 due to the latest change in nptl/pt-longjmp.c (https://sourceware.org/ml/libc-alpha/2015-02/msg00123.html). The s390-version of pt-longjmp.c includes the generic one and adds an additional compat-version, because those symbols were introduced and reverted in glibc 2.19. This patch fixes the inclusion of nptl/pt-longjmp.c and uses the introduced macro DEFINE_LONGJMP to generate the additional symbol for the compat-version. Ok to commit? Bye Stefan --- 2015-02-12 Stefan Liebler * sysdeps/unix/sysv/linux/s390/pt-longjmp.c (__v1longjmp): Remove versioned symbol. (__v1siglongjmp): Remove alias and versioned symbol. (__v2longjmp): Use DEFINE_LONGJMP instead of alias. (__v2siglongjmp): Likewise. diff --git a/sysdeps/unix/sysv/linux/s390/pt-longjmp.c b/sysdeps/unix/sysv/linux/s390/pt-longjmp.c index 017ea31..fddcf20 100644 --- a/sysdeps/unix/sysv/linux/s390/pt-longjmp.c +++ b/sysdeps/unix/sysv/linux/s390/pt-longjmp.c @@ -20,25 +20,14 @@ #include -#if defined SHARED && SHLIB_COMPAT (libpthread, GLIBC_2_19, GLIBC_2_20) - /* we need a unique name in case of symbol versioning. */ -# define longjmp __v1longjmp -#endif /* defined SHARED && SHLIB_COMPAT (libpthread, GLIBC_2_19, GLIBC_2_20)) */ - #include #if defined SHARED && SHLIB_COMPAT (libpthread, GLIBC_2_19, GLIBC_2_20) /* 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. */ -# undef longjmp - -strong_alias (__v1longjmp, __v2longjmp) -versioned_symbol (libpthread, __v1longjmp, longjmp, GLIBC_2_0); +DEFINE_LONGJMP (__v2longjmp) compat_symbol (libpthread, __v2longjmp, longjmp, GLIBC_2_19); - -weak_alias (siglongjmp, __v1siglongjmp) -weak_alias (siglongjmp, __v2siglongjmp) -versioned_symbol (libpthread, __v1siglongjmp, siglongjmp, GLIBC_2_0); +DEFINE_LONGJMP (__v2siglongjmp) compat_symbol (libpthread, __v2siglongjmp, siglongjmp, GLIBC_2_19); #endif /* defined SHARED && SHLIB_COMPAT (libpthread, GLIBC_2_19, GLIBC_2_20)) */