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.

diff --git a/ld/testsuite/ld-arm/rodata-merge-map.sym b/ld/testsuite/ld-arm/rodata-merge-map.sym
index 245ce7c3ffa9a89340e6b00ef931a5c69f773b49..f8edc2e852b2f92b93f0829427f75427e0c5711e 100644 (file)
--- 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 45aaef0736ba237ee158e08d4daa7e4017d043ca..904ee81f153390400206bda152bf4839be5b5e04 100644 (file)
--- 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: