From patchwork Wed Jul 22 17:03:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Eggert X-Patchwork-Id: 498742 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 EF1791402D4 for ; Thu, 23 Jul 2015 03:03:35 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=HMge1NYd; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:date:from:mime-version:to:cc :subject:references:in-reply-to:content-type; q=dns; s=default; b= Kkr+VSs4m5veffAwL4NpEeYDFiZ9HHTin8gyFgpoXz6XiQlo4+QxCtTJwRBd0NhI zt2bNOT8uF8yxfO+dPikjLjgGfg7Fe6PxORGK7VTPSusoeCI2mz04ubxSlgiLpz0 cqiUFwMSaGbfw1NInQ025W5LqTcp88K1x2xRw4Xe1hA= 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:message-id:date:from:mime-version:to:cc :subject:references:in-reply-to:content-type; s=default; bh=U/1u TDTtmJegPUbLj6nCFawUKb4=; b=HMge1NYd6Cz/wczPlVBYU7WiYDnnI3kc8VJY X2//5ENe8oSyjBUoiG4bIksZ+bgBQJ2BDYhkmMRHTKyAuLOUFecdZYi4qkCFHH6s wZRFLccY5oOjfOEgZgGnRFpQ604uQx3Ixd/K/0RkNH3aFyuVoEsRwcOuk2DJYuA6 Id2w+PU= Received: (qmail 82326 invoked by alias); 22 Jul 2015 17:03:29 -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 82312 invoked by uid 89); 22 Jul 2015 17:03:28 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: zimbra.cs.ucla.edu Message-ID: <55AFCCD9.3040805@cs.ucla.edu> Date: Wed, 22 Jul 2015 10:03:21 -0700 From: Paul Eggert User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: sellcey@imgtec.com, Andreas Schwab CC: Roland McGrath , Jeff Law , GNU C Library Subject: Re: Another GLIBC build error with GCC6 References: <1437496279.19674.126.camel@ubuntu-sellcey> <1437507995.19674.136.camel@ubuntu-sellcey> <55AEA71B.2020405@redhat.com> <1437509796.19674.138.camel@ubuntu-sellcey> <55AEB7FF.1000405@redhat.com> <1437518197.19674.152.camel@ubuntu-sellcey> <20150721224637.1E0102C3B32@topped-with-meat.com> <55AF30A1.2030402@cs.ucla.edu> <1437578812.19674.161.camel@ubuntu-sellcey> <1437581957.19674.167.camel@ubuntu-sellcey> <87pp3kf942.fsf@igel.home> <1437582979.19674.168.camel@ubuntu-sellcey> In-Reply-To: <1437582979.19674.168.camel@ubuntu-sellcey> Steve Ellcey wrote: > I can't seem to find it in my email, can you send it again? One must read Andreas's messages carefully. You could try the attached (untested) patch, which implements his suggestion. From 6b661c83b411fe5b020c3523ca6cbd29fc63b2b7 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 22 Jul 2015 10:00:28 -0700 Subject: [PATCH] Port DT_EXTRATAGIDX to GCC 6. See Steve Ellcey's bug report in: https://sourceware.org/ml/libc-alpha/2015-07/msg00690.html * elf/elf.h (DT_EXTRATAGIDX): Simplify by rewriting it the same way as DT_VERSIONTAGIDX. Suggested by Andreas Schwab in: https://sourceware.org/ml/libc-alpha/2015-07/msg00702.html --- ChangeLog | 9 +++++++++ elf/elf.h | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9f87cd9..988273c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2015-07-22 Paul Eggert + + Port DT_EXTRATAGIDX to GCC 6. + See Steve Ellcey's bug report in: + https://sourceware.org/ml/libc-alpha/2015-07/msg00690.html + * elf/elf.h (DT_EXTRATAGIDX): Simplify by rewriting it the + same way as DT_VERSIONTAGIDX. Suggested by Andreas Schwab in: + https://sourceware.org/ml/libc-alpha/2015-07/msg00702.html + 2015-07-21 Paul Eggert Port the 0x7efe...feff pattern to GCC 6. diff --git a/elf/elf.h b/elf/elf.h index fbadda4..1d7ccc0 100644 --- a/elf/elf.h +++ b/elf/elf.h @@ -801,7 +801,7 @@ typedef struct range. Be compatible. */ #define DT_AUXILIARY 0x7ffffffd /* Shared object to load before self */ #define DT_FILTER 0x7fffffff /* Shared object to get values from */ -#define DT_EXTRATAGIDX(tag) ((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1) +#define DT_EXTRATAGIDX(tag) (DT_FILTER - (tag)) /* Reverse order! */ #define DT_EXTRANUM 3 /* Values of `d_un.d_val' in the DT_FLAGS entry. */ -- 2.1.0