sparc testsuite fallout

(cherry picked from commit f1a9fbd995b8997b7ed7e8e6a83129e923400a58)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 4d85dbf1aee53120b3f42f6023d2296203bb00f8..4e6c60b761190d4a0841bb0a48a1f731238ee1a9 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,6 +1,10 @@
 2021-01-01  Alan Modra  <amodra@gmail.com>
 
        Apply from master
+       2020-08-24  Alan Modra  <amodra@gmail.com>
+       * testsuite/ld-sparc/tlssunbin32.rd: Update for new readelf output.
+       * testsuite/ld-sparc/tlssunbin64.rd: Likewise.
+
        2020-08-22  H.J. Lu  <hongjiu.lu@intel.com>
        PR ld/26382
        * testsuite/ld-elf/pr26302.nd: Updated.

diff --git a/ld/testsuite/ld-sparc/tlssunbin32.rd b/ld/testsuite/ld-sparc/tlssunbin32.rd
index 937611da91b35b745f83c3f5df5cf65c5fd97867..a41f27d644c764047d3a8311df144d3fe2fbfcf4 100644 (file)
--- a/ld/testsuite/ld-sparc/tlssunbin32.rd
+++ b/ld/testsuite/ld-sparc/tlssunbin32.rd
@@ -111,7 +111,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* FUNC +GLOBAL +DEFAULT +8 _start
 .* TLS +GLOBAL +HIDDEN +9 sh4
 .* TLS +GLOBAL +DEFAULT +10 bg7
-.* FUNC +GLOBAL +DEFAULT +UND __tls_get_addr@@SUNWprivate_1.1
+.* FUNC +GLOBAL +DEFAULT +UND __tls_get_addr@SUNWprivate_1.1
 .* TLS +GLOBAL +HIDDEN +9 sh5
 .* NOTYPE +GLOBAL +DEFAULT +12 __bss_start
 .* TLS +GLOBAL +DEFAULT +UND sG6

diff --git a/ld/testsuite/ld-sparc/tlssunbin64.rd b/ld/testsuite/ld-sparc/tlssunbin64.rd
index 07a632c5ec9df3c47152a427ebba979dcc385328..4d792b841089ed3f3f5841cc78ff5dd745a7798d 100644 (file)
--- a/ld/testsuite/ld-sparc/tlssunbin64.rd
+++ b/ld/testsuite/ld-sparc/tlssunbin64.rd
@@ -111,7 +111,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* FUNC +GLOBAL +DEFAULT +8 _start
 .* TLS +GLOBAL +HIDDEN +9 sh4
 .* TLS +GLOBAL +DEFAULT +10 bg7
-.* FUNC +GLOBAL +DEFAULT +UND __tls_get_addr@@SUNWprivate_1.1
+.* FUNC +GLOBAL +DEFAULT +UND __tls_get_addr@SUNWprivate_1.1
 .* TLS +GLOBAL +HIDDEN +9 sh5
 .* NOTYPE +GLOBAL +DEFAULT +12 __bss_start
 .* TLS +GLOBAL +DEFAULT +UND sG6