From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 461673858C62 for ; Wed, 18 Jan 2023 17:32:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 461673858C62 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id 6514938C4F for ; Wed, 18 Jan 2023 17:32:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1674063129; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=qs6tqL5MnyaCSsulKaFpFAn2y9O8kfihSmee0FmwEyU=; b=TGP7m7jka/VbWaZpcFGbfY2VDm6rmg9J1Hd4+uK/lEgMam04K1UgXMGJYKO8CUj3mE2N7m V28vudKUtHMCOIR611231lr7naeBXtVWkBtEFLuUgbsz8FPUWWCVZ886Pzkgu04ps3ZCQm QWd2o7OvQmjik8VjN78n6vQ32gz+P0w= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1674063129; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=qs6tqL5MnyaCSsulKaFpFAn2y9O8kfihSmee0FmwEyU=; b=7NyRyo8Es/U1fWmxTbpXAmleYfzCllrLm1l0Puj6ZkppcP0Uul0zUiHyI5UfkPH89l86w7 x5fG7u2ZzlKozsDA== 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 609172C141 for ; Wed, 18 Jan 2023 17:32:09 +0000 (UTC) Received: by wotan.suse.de (Postfix, from userid 10510) id 5B9596397; Wed, 18 Jan 2023 17:32:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by wotan.suse.de (Postfix) with ESMTP id 5A7A762E5 for ; Wed, 18 Jan 2023 17:32:09 +0000 (UTC) Date: Wed, 18 Jan 2023 17:32:09 +0000 (UTC) From: Michael Matz To: binutils@sourceware.org Subject: [PATCH 2/3] arm32: Fix rodata-merge-map Message-ID: User-Agent: Alpine 2.20 (LSU 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,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 List-Id: the test expects a second, but useless, $d mapping symbol for the partially merged section, and specifically disallows one for the completely merged section. The new merging algorithm makes it so that also the partially merged sections are conceptually SEC_EXCLUDED, except the first merge section (e.g. as if the very first object file already contains all strings). So that second mapping symbol is now missing. It never was needed anyway. So, adjust the test. --- ld/testsuite/ld-arm/rodata-merge-map.sym | 3 +-- ld/testsuite/ld-arm/rodata-merge-map3.s | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ld/testsuite/ld-arm/rodata-merge-map.sym b/ld/testsuite/ld-arm/rodata-merge-map.sym index 245ce7c3ffa..f8edc2e852b 100644 --- a/ld/testsuite/ld-arm/rodata-merge-map.sym +++ b/ld/testsuite/ld-arm/rodata-merge-map.sym @@ -1,8 +1,7 @@ -Symbol table '.symtab' contains 5 entries: +Symbol table '.symtab' contains 4 entries: Num: Value Size Type Bind Vis Ndx Name 0: 00000000 0 NOTYPE LOCAL DEFAULT UND 1: 00000000 0 SECTION LOCAL DEFAULT 1.* 2: 00000000 0 SECTION LOCAL DEFAULT 2.* 3: 00000000 0 NOTYPE LOCAL DEFAULT 1 \$d - 4: 0000000c 0 NOTYPE LOCAL DEFAULT 1 \$d diff --git a/ld/testsuite/ld-arm/rodata-merge-map3.s b/ld/testsuite/ld-arm/rodata-merge-map3.s index 45aaef0736b..904ee81f153 100644 --- a/ld/testsuite/ld-arm/rodata-merge-map3.s +++ b/ld/testsuite/ld-arm/rodata-merge-map3.s @@ -1,7 +1,8 @@ @ This file contains the 3rd contribution, which is expected to @ be partially merged into the 1st contribution (from -@ rodata-merge-map1.s), and generate a (redundant, but harmless) -@ $d mapping symbol. +@ rodata-merge-map1.s). +@ It could generate a (redundant, but harmless) $d mapping symbol, +@ but doesn't. .section .rodata.str1.1,"aMS",%progbits,1 .LC0: -- 2.36.1