From patchwork Thu Mar 2 19:02:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 734735 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 3vZ1sP69BVz9s2s for ; Fri, 3 Mar 2017 06:02:33 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="kVX9mzDl"; 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:subject:references:from:cc:to:message-id:date :mime-version:in-reply-to:content-type; q=dns; s=default; b=ba24 QjSvz8Op39sEwtnwwXj2RwxtXz3rDt6fqsXjJmVgv+ti7DuUWqG7o5SvQRVzth/M FsT0so2JqvJQ6Fwo3QJqa7rnBM1rrKs/YgCXu+rw11RKDzSf3cMnZ0HXDS+wPFiE piNeMRkixgjzuVwCMkFzmhd6rbIFpfrfl/wRdQQ= 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:subject:references:from:cc:to:message-id:date :mime-version:in-reply-to:content-type; s=default; bh=KfDDeQ9TBl y/+6mL/cd3C6tsWR8=; b=kVX9mzDljJeAiBajqL4WFLmU+XVbtX0vMA15IJOaqt 4nP94PvkkiIypNk/GM540Xfng6EsEz0xcUUgP7ZrhgL0g0kUX3yBshuYSlLq5wsW kW5u/C9PtaNemOhytjDsLPUMZkox7KtCn3h9nOXrKXVXqFMMtPoA9o6vDbMLx6vR I= Received: (qmail 100820 invoked by alias); 2 Mar 2017 19:02:26 -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 100809 invoked by uid 89); 2 Mar 2017 19:02:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:1414, H*Ad:U*schwab, HTo:U*schwab X-HELO: mx1.redhat.com Subject: Re: [PATCH 3/4] Miscellaneous 'safe' testsuite changes. References: <20170220130342.6373-1-zackw@panix.com> <20170220130342.6373-2-zackw@panix.com> <20170220130342.6373-3-zackw@panix.com> <20170220130342.6373-4-zackw@panix.com> <8c498c93-b2cf-a2af-a741-bc721ac47f6e@redhat.com> <87k28eugjp.fsf@mid.deneb.enyo.de> <87innrwzmf.fsf@linux-m68k.org> From: Florian Weimer Cc: libc-alpha@sourceware.org, "Carlos O'Donell" , Zack Weinberg , joseph@codesourcery.com, adhemerval.zanella@linaro.org, libc-alpha@sourceware.org To: Andreas Schwab Message-ID: <3ad5454a-1d0a-f39d-b8aa-225e5f7c2e49@redhat.com> Date: Thu, 2 Mar 2017 20:02:22 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <87innrwzmf.fsf@linux-m68k.org> On 03/02/2017 02:56 PM, Andreas Schwab wrote: >> + >> +#endif /* get-dynamic-info.h */ > This is bogus. The file must be included multiple times, depending on > the definition of RESOLVE_MAP. > > This breaks powerpc > . Thanks for identifying the root cause. I've tested the attached patch on ppc64, ppc64le, ppc, aarch64, and s390x, and committed it. Thanks, Florian Remove header file inclusion guard from elf/get-dynamic-info.h This file is included multiple times, so the guard is harmful. Fixes commit 9090848d0607e93fb08a1d68d9f263846ee33f02. 2017-03-02 Florian Weimer * elf/get-dynamic-info.h: Remove header file inclusion guard. diff --git a/elf/get-dynamic-info.h b/elf/get-dynamic-info.h index 6413558..7525c3a 100644 --- a/elf/get-dynamic-info.h +++ b/elf/get-dynamic-info.h @@ -16,8 +16,8 @@ License along with the GNU C Library; if not, see . */ -#ifndef _GET_DYNAMIC_INFO_H -#define _GET_DYNAMIC_INFO_H 1 +/* This file is included multiple times and therefore lacks a header + file inclusion guard. */ #include #include @@ -182,5 +182,3 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp) info[DT_RPATH] = NULL; #endif } - -#endif /* get-dynamic-info.h */