From patchwork Fri Nov 25 16:58:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Matz X-Patchwork-Id: 26101 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp4158760wrr; Fri, 25 Nov 2022 08:58:15 -0800 (PST) X-Google-Smtp-Source: AA0mqf7xNHstU+BhypMO4pKGvp8mGanQYW7fdTsVHcO8nIItgDn8oPjYzkzmDaUD5h4G3U5dzAc/ X-Received: by 2002:a17:906:68cd:b0:7ac:f8e3:d547 with SMTP id y13-20020a17090668cd00b007acf8e3d547mr22298836ejr.53.1669395495458; Fri, 25 Nov 2022 08:58:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669395495; cv=none; d=google.com; s=arc-20160816; b=V7+SENOJJvaR9MGqBDTQZGyEJsbsoUQU9jfTIxJhfmnVlRumS1bqgNrvASbeBgiHrG 46/Hhqf/TjEuxcPomwdLxKc+Y/1tJvZvkyiEglpPsuYpt18sR2kzccbiFL6uqSJELtLG 1MBj3JK7E+SJEAk+6JjfbhJ1iclBkiU1KkTc8rxeIxyMN45izduJwaRqqEbtvqeAfNP2 kHzWjVSUEBuD+Ht2xiKm9pO4eOwNUnGZzo60FRQWNepumHYXkdkrnBgJEosPnpuxXVnB kBMYlQAabh9g0YkaASRCVyCcqyJJ1zxygaZFijZPISWYfKdq7NoJ7S5K1/CSIWv1/M1n jsww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:mime-version :user-agent:references:message-id:in-reply-to:subject:to:date :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=GEUdRDmm4NO9++zSMGwaumt04faIthnKWt1XTPvIdZQ=; b=zLhkVUpo9cGIFEqeDkhOrL9g1NEPcHH3TtkhYWrL9yt0NVltsKNL95qUUeylnQP7vs By414s3Xd6TpN9D4/81Ew5NuDVwSU3a3NcUbanKuFE3v4YChyJUidNiDSJipYBwTG4Vf n5M41FdUCheAXs/p2ZchrJxXOjeQMbShASplB+KAu3acEjk/qTWFsha/Ra5lt1Wpstq6 l3VjCKD/wMJmESvYELykY1DlVapm2K6f/JdYLEFTiANauA7eAKVZMPrZTNEAu50Y36It 7eyl/D+YunEfw9f7HXRD5VsCxWae7EWjmbagN+PfCQeFuclpd5/lwghhXZcM4Uh3zIOP kWWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=aDmGnnXY; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id sd36-20020a1709076e2400b007313312730esi3626929ejc.85.2022.11.25.08.58.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Nov 2022 08:58:15 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=aDmGnnXY; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F32F4384E3A3 for ; Fri, 25 Nov 2022 16:58:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F32F4384E3A3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669395493; bh=GEUdRDmm4NO9++zSMGwaumt04faIthnKWt1XTPvIdZQ=; h=Date:To:Subject:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=aDmGnnXYpWPyGB+ihQrAjGpgYi9ELfIv/rfiEunMiNwoSSdpwZKnYh9ZzBBgdz7S8 enAmNQxZQAWj98UfBOkaC4gtJ9LF9Zp2+54Bupv7IU3GZD4Xdpcf3iIDxousUOusQ2 i+4UQMXlnon9jNbV5JiYogpNa8xegFX+amC6Fs7M= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id C33E5384E394 for ; Fri, 25 Nov 2022 16:58:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C33E5384E394 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id 09C4B21AF9 for ; Fri, 25 Nov 2022 16:58:04 +0000 (UTC) Received: from wotan.suse.de (wotan.suse.de [10.160.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id 0586C2C141 for ; Fri, 25 Nov 2022 16:58:04 +0000 (UTC) Received: by wotan.suse.de (Postfix, from userid 10510) id F41AC6586; Fri, 25 Nov 2022 16:58:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by wotan.suse.de (Postfix) with ESMTP id F2CC46238 for ; Fri, 25 Nov 2022 16:58:03 +0000 (UTC) Date: Fri, 25 Nov 2022 16:58:03 +0000 (UTC) To: binutils@sourceware.org Subject: [PATCH 8/8] section-select: Fix exclude-file-3 In-Reply-To: Message-ID: References: User-Agent: Alpine 2.20 (LSU 67 2015-01-07) MIME-Version: 1.0 X-Spam-Status: No, score=-8.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Michael Matz via Binutils From: Michael Matz Reply-To: Michael Matz Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750488051196668905?= X-GMAIL-MSGID: =?utf-8?q?1750488051196668905?= this testcase wasn't correctly testing everything, it passed, even though sections from an excluded file were included. Fixing this reveals a problem in the new section selector. This fixes that as well. --- ld/ldlang.c | 7 ++++--- ld/testsuite/ld-scripts/exclude-file-3.map | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ld/ldlang.c b/ld/ldlang.c index abaa9916256..4e9b93a83a7 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -422,6 +422,10 @@ walk_wild_section_match (lang_wild_statement_type *ptr, return; } + /* If filename is excluded we're done. */ + if (walk_wild_file_in_exclude_list (ptr->exclude_name_list, file)) + return; + /* Check section name against each wildcard spec. If there's no wildcard all sections match. */ sec = ptr->section_list; @@ -920,9 +924,6 @@ resolve_wilds (void) LANG_FOR_EACH_INPUT_STATEMENT (f) { //printf("XXX %s\n", f->filename); - /* XXX if (walk_wild_file_in_exclude_list (s->exclude_name_list, f)) - return;*/ - if (f->the_bfd == NULL || !bfd_check_format (f->the_bfd, bfd_archive)) resolve_wild_sections (f); diff --git a/ld/testsuite/ld-scripts/exclude-file-3.map b/ld/testsuite/ld-scripts/exclude-file-3.map index 389d1708c90..255182030ca 100644 --- a/ld/testsuite/ld-scripts/exclude-file-3.map +++ b/ld/testsuite/ld-scripts/exclude-file-3.map @@ -3,5 +3,7 @@ EXCLUDE_FILE\(\*-b\.o\) \*\(\.data \.data\.\*\) \.data +0x[0-9a-f]+ +0x[0-9a-f]+ tmpdir/exclude-file-a\.o \.data\.1 +0x[0-9a-f]+ +0x[0-9a-f]+ tmpdir/exclude-file-a\.o +#failif +.*data +0x[0-9a-f]+ +0x[0-9a-f]+ .*exclude-file-b.* -#... \ No newline at end of file +#...