PR ld/20828: Remove leading `_' from symbols used in tests

Complement commit 81ff47b3a546 ("PR ld/20828: Fix linker script symbols
wrongly forced local with section GC") and remove the leading underscore
from `_fdata' and `_edata' symbols used in tests, fixing a:

FAIL: PR ld/20828 dynamic symbols with section GC (version script)

failure with targets such as: `bfin-elf', `bfin-uclinux', `metag-elf',
`metag-linux' `mn10300-elf', `sh-elf', `sh64-elf', and possibly other
ones, that have `_' set (with `elf_symbol_leading_char') as the leading
character for symbols.  As from commit 93252b1cf41a ("bfd/ld: handle ABI
prefixes in version scripts") these targets strip the leading underscore
before applying version script rules, because the (default) syntax for
symbol names is that of the C language rather than their low-level
symbol table encoding.

	ld/
	PR ld/20828
	* testsuite/ld-elf/pr20828.ld: Rename `_fdata' and `_edata' to
	`fdata' and `edata' respectively.
	* testsuite/ld-elf/pr20828.ver: Adjust accordingly.
	* testsuite/ld-elf/pr20828-a.sd: Likewise.
	* testsuite/ld-elf/pr20828-b.sd: Likewise.
	* testsuite/ld-elf/pr20828-c.sd: Likewise.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 89f4766481e45cfb0d394588348124129e43e466..edefd03a381f3b2dff693852d512d88c4ece230a 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,13 @@
+2017-01-23  Maciej W. Rozycki  <macro@imgtec.com>
+
+       PR ld/20828
+       * testsuite/ld-elf/pr20828.ld: Rename `_fdata' and `_edata' to
+       `fdata' and `edata' respectively.
+       * testsuite/ld-elf/pr20828.ver: Adjust accordingly.
+       * testsuite/ld-elf/pr20828-a.sd: Likewise.
+       * testsuite/ld-elf/pr20828-b.sd: Likewise.
+       * testsuite/ld-elf/pr20828-c.sd: Likewise.
+
 2017-01-23  Maciej W. Rozycki  <macro@imgtec.com>
 
        PR ld/20828

diff --git a/ld/testsuite/ld-elf/pr20828-a.sd b/ld/testsuite/ld-elf/pr20828-a.sd
index c24e5ad583ce8795086c1e2be2c2498090ffeb73..a24eedba654046684474faeff9deffe51da6c922 100644 (file)
--- a/ld/testsuite/ld-elf/pr20828-a.sd
+++ b/ld/testsuite/ld-elf/pr20828-a.sd
@@ -1,9 +1,9 @@
-# Make sure `_fdata' is global rather than local in the dynamic symbol table,
+# Make sure `fdata' is global rather than local in the dynamic symbol table,
 # e.g.:
 #    Num:    Value  Size Type    Bind   Vis      Ndx Name
-#      1: 00000000     0 NOTYPE  GLOBAL DEFAULT    1 _fdata
+#      1: 00000000     0 NOTYPE  GLOBAL DEFAULT    1 fdata
 # vs:
-#      1: 00000000     0 NOTYPE  LOCAL  DEFAULT    1 _fdata
+#      1: 00000000     0 NOTYPE  LOCAL  DEFAULT    1 fdata
 #...
- *[0-9]+: +[0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +[0-9]+ +_fdata
+ *[0-9]+: +[0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +[0-9]+ +fdata
 #pass

diff --git a/ld/testsuite/ld-elf/pr20828-b.sd b/ld/testsuite/ld-elf/pr20828-b.sd
index c4b239b3fa4db484a86fe9d95737f7487caa2fd9..95551bbf1b538bbabf43feb79670e6b11a157a70 100644 (file)
--- a/ld/testsuite/ld-elf/pr20828-b.sd
+++ b/ld/testsuite/ld-elf/pr20828-b.sd
@@ -1,9 +1,9 @@
-# Make sure `_edata' is global rather than local in the dynamic symbol table,
+# Make sure `edata' is global rather than local in the dynamic symbol table,
 # e.g.:
 #    Num:    Value  Size Type    Bind   Vis      Ndx Name
-#      1: 00000000     0 NOTYPE  GLOBAL DEFAULT    1 _edata
+#      1: 00000000     0 NOTYPE  GLOBAL DEFAULT    1 edata
 # vs:
-#      1: 00000000     0 NOTYPE  LOCAL  DEFAULT    1 _edata
+#      1: 00000000     0 NOTYPE  LOCAL  DEFAULT    1 edata
 #...
- *[0-9]+: +[0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +[0-9]+ +_edata
+ *[0-9]+: +[0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +[0-9]+ +edata
 #pass

diff --git a/ld/testsuite/ld-elf/pr20828-c.sd b/ld/testsuite/ld-elf/pr20828-c.sd
index 8089c486b9d44a516a142ad06c1ffd1b236edd0f..5501e19418aad9cc1d9669494e73db9c3d54edd3 100644 (file)
--- a/ld/testsuite/ld-elf/pr20828-c.sd
+++ b/ld/testsuite/ld-elf/pr20828-c.sd
@@ -1,7 +1,7 @@
-# Make sure no `_fdata' is present in the dynamic symbol table, e.g.:
+# Make sure no `fdata' is present in the dynamic symbol table, e.g.:
 #    Num:    Value  Size Type    Bind   Vis      Ndx Name
-#      1: 00000000     0 NOTYPE  LOCAL  DEFAULT    1 _fdata
+#      1: 00000000     0 NOTYPE  LOCAL  DEFAULT    1 fdata
 #failif
 #...
-.+ +_fdata
+.+ +fdata
 #pass

diff --git a/ld/testsuite/ld-elf/pr20828.ld b/ld/testsuite/ld-elf/pr20828.ld
index 9ca19436bb0cee5d2cfe96da2ce8a76bd5e73552..11aea82f8753d2f46828abfd7f49e184887b600e 100644 (file)
--- a/ld/testsuite/ld-elf/pr20828.ld
+++ b/ld/testsuite/ld-elf/pr20828.ld
@@ -2,9 +2,9 @@ SECTIONS
 {
   .data :
   {
-    _fdata = .;
+    fdata = .;
     *(.data)
-    _edata = .;
+    edata = .;
   }
   .dynamic : { *(.dynamic) }
   .hash : { *(.hash) }

diff --git a/ld/testsuite/ld-elf/pr20828.ver b/ld/testsuite/ld-elf/pr20828.ver
index 7d0fa228147e09da3fdb3ff68791d0be5623764a..bbc0ebde477efac860f4267c17162855902dfa8e 100644 (file)
--- a/ld/testsuite/ld-elf/pr20828.ver
+++ b/ld/testsuite/ld-elf/pr20828.ver
@@ -1 +1 @@
-{ global: _edata; local: *; };
+{ global: edata; local: *; };