diff options
| author | Michael Matz <matz@suse.de> | 2022-11-03 18:00:04 +0100 |
|---|---|---|
| committer | Michael Matz <matz@suse.de> | 2023-01-20 14:58:04 +0100 |
| commit | 26ec71f5128af2da9bf859321f388f76ad04dfe0 (patch) | |
| tree | d330cfe65c48e9860e01572200b9049d7666a566 /ld | |
| parent | 1a528d3ef07fc6084fc51759c1b2f8abb5c8127e (diff) | |
| download | binutils-26ec71f5128af2da9bf859321f388f76ad04dfe0.zip binutils-26ec71f5128af2da9bf859321f388f76ad04dfe0.tar.gz binutils-26ec71f5128af2da9bf859321f388f76ad04dfe0.tar.bz2 | |
arm32: Fix rodata-merge-map
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.
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/testsuite/ld-arm/rodata-merge-map.sym | 3 | ||||
| -rw-r--r-- | 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 245ce7c..f8edc2e 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 45aaef0..904ee81 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: |