FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

arm32: Fix rodata-merge-map

Browse source 
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.
This commit is contained in:
Michael Matz 2022-11-03 18:00:04 +01:00
parent 1a528d3ef0
commit 26ec71f512
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ld/testsuite/ld-arm/rodata-merge-map.sym
View file

@ -1,8 +1,7 @@
Symbol table '.symtab' contains 5 entries: Symbol table '.symtab' contains 4 entries:
Num: Value Size Type Bind Vis Ndx Name Num: Value Size Type Bind Vis Ndx Name
0: 00000000 0 NOTYPE LOCAL DEFAULT UND 0: 00000000 0 NOTYPE LOCAL DEFAULT UND
1: 00000000 0 SECTION LOCAL DEFAULT 1.* 1: 00000000 0 SECTION LOCAL DEFAULT 1.*
2: 00000000 0 SECTION LOCAL DEFAULT 2.* 2: 00000000 0 SECTION LOCAL DEFAULT 2.*
3: 00000000 0 NOTYPE LOCAL DEFAULT 1 \$d 3: 00000000 0 NOTYPE LOCAL DEFAULT 1 \$d
4: 0000000c 0 NOTYPE LOCAL DEFAULT 1 \$d

5
ld/testsuite/ld-arm/rodata-merge-map3.s
View file

@ -1,7 +1,8 @@
@ This file contains the 3rd contribution, which is expected to @ This file contains the 3rd contribution, which is expected to
@ be partially merged into the 1st contribution (from @ be partially merged into the 1st contribution (from
@ rodata-merge-map1.s), and generate a (redundant, but harmless) @ rodata-merge-map1.s).
@ $d mapping symbol. @ It could generate a (redundant, but harmless) $d mapping symbol,
@ but doesn't.
.section .rodata.str1.1,"aMS",%progbits,1 .section .rodata.str1.1,"aMS",%progbits,1
.LC0: .LC0: