From: Michael Matz <matz@suse.de>
To: binutils@sourceware.org
Subject: [PATCH 2/3] arm32: Fix rodata-merge-map
Date: Wed, 18 Jan 2023 17:32:09 +0000 (UTC) [thread overview]
Message-ID: <alpine.LSU.2.20.2301181731590.30340@wotan.suse.de> (raw)
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
reply other threads:[~2023-01-18 17:32 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LSU.2.20.2301181731590.30340@wotan.suse.de \
--to=matz@suse.de \
--cc=binutils@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).