[3/3] Adjust testcases for readelf printing 'foo@@'

Michael Matz matz@suse.de
Thu Nov 20 15:30:42 GMT 2025 

those are the public base-version symbols.
---
 ld/testsuite/ld-elf/pr23161b.rd           | 6 +++---
 ld/testsuite/ld-elf/pr25617-1a-sec-hdr.rd | 4 ++--
 ld/testsuite/ld-elf/pr28348.rd            | 2 +-
 ld/testsuite/ld-ifunc/pr23169a.rd         | 2 +-
 ld/testsuite/ld-ifunc/pr23169b.rd         | 2 +-
 ld/testsuite/ld-ifunc/pr23169c.rd         | 2 +-
 ld/testsuite/ld-plugin/pr22983.1.d        | 2 +-
 ld/testsuite/ld-plugin/pr22983.2.d        | 2 +-
 ld/testsuite/ld-plugin/pr22983.3.d        | 2 +-
 ld/testsuite/ld-plugin/pr22983.4.d        | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ld/testsuite/ld-elf/pr23161b.rd b/ld/testsuite/ld-elf/pr23161b.rd
index ba777f71c02..b45a8514f3e 100644
--- a/ld/testsuite/ld-elf/pr23161b.rd
+++ b/ld/testsuite/ld-elf/pr23161b.rd
@@ -1,7 +1,7 @@
 #...
- +[0-9]+: +[a-f0-9]+ +0 +NOTYPE +GLOBAL +DEFAULT.* [0-9]+ +_?_(_bss_start|edata|end)
+ +[0-9]+: +[a-f0-9]+ +0 +NOTYPE +GLOBAL +DEFAULT.* [0-9]+ +_?_(_bss_start|edata|end)@?@?
 #...
- +[0-9]+: +[a-f0-9]+ +0 +NOTYPE +GLOBAL +DEFAULT.* [0-9]+ +_?_(_bss_start|edata|end)
+ +[0-9]+: +[a-f0-9]+ +0 +NOTYPE +GLOBAL +DEFAULT.* [0-9]+ +_?_(_bss_start|edata|end)@?@?
 #...
- +[0-9]+: +[a-f0-9]+ +0 +NOTYPE +GLOBAL +DEFAULT.* [0-9]+ +_?_(_bss_start|edata|end)
+ +[0-9]+: +[a-f0-9]+ +0 +NOTYPE +GLOBAL +DEFAULT.* [0-9]+ +_?_(_bss_start|edata|end)@?@?
 #pass
diff --git a/ld/testsuite/ld-elf/pr25617-1a-sec-hdr.rd b/ld/testsuite/ld-elf/pr25617-1a-sec-hdr.rd
index 0de2915811a..a075474d3a0 100644
--- a/ld/testsuite/ld-elf/pr25617-1a-sec-hdr.rd
+++ b/ld/testsuite/ld-elf/pr25617-1a-sec-hdr.rd
@@ -13,7 +13,7 @@ Program Headers:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
  +0: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND +
 #...
-.* FUNC +GLOBAL +DEFAULT.* (UND +_?puts(@.*|)|[0-9]+ +_?test)
+.* FUNC +GLOBAL +DEFAULT.* (UND +_?puts(@.*|)|[0-9]+ +_?test@?@?)
 #...
-.* FUNC +GLOBAL +DEFAULT.* (UND +_?puts(@.*|)|[0-9]+ +_?test)
+.* FUNC +GLOBAL +DEFAULT.* (UND +_?puts(@.*|)|[0-9]+ +_?test@?@?)
 #pass
diff --git a/ld/testsuite/ld-elf/pr28348.rd b/ld/testsuite/ld-elf/pr28348.rd
index 6e6ac042498..954cd80d1f8 100644
--- a/ld/testsuite/ld-elf/pr28348.rd
+++ b/ld/testsuite/ld-elf/pr28348.rd
@@ -4,5 +4,5 @@
 #xfail: ![check_shared_lib_support]
 
 #...
- +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +FUNC +WEAK +DEFAULT (\[NOPV\]|) +[0-9]+ +_?foo
+ +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +FUNC +WEAK +DEFAULT (\[NOPV\]|) +[0-9]+ +_?foo@?@?
 #pass
diff --git a/ld/testsuite/ld-ifunc/pr23169a.rd b/ld/testsuite/ld-ifunc/pr23169a.rd
index fcb4feae950..f67a19e2c55 100644
--- a/ld/testsuite/ld-ifunc/pr23169a.rd
+++ b/ld/testsuite/ld-ifunc/pr23169a.rd
@@ -1,3 +1,3 @@
 #...
- +[0-9]+: +[0-9a-f]+ +[0-9]+ +I?FUNC +GLOBAL +DEFAULT.* [0-9]+ +func
+ +[0-9]+: +[0-9a-f]+ +[0-9]+ +I?FUNC +GLOBAL +DEFAULT.* [0-9]+ +func@?@?
 #pass
diff --git a/ld/testsuite/ld-ifunc/pr23169b.rd b/ld/testsuite/ld-ifunc/pr23169b.rd
index 8f80052c332..f89fa10573c 100644
--- a/ld/testsuite/ld-ifunc/pr23169b.rd
+++ b/ld/testsuite/ld-ifunc/pr23169b.rd
@@ -1,4 +1,4 @@
 #failif
 #...
-[0-9a-f]+ +[0-9a-f]+ +R_[^ ]+ +[0-9a-f]+ +func(| \+ 0)
+[0-9a-f]+ +[0-9a-f]+ +R_[^ ]+ +[0-9a-f]+ +func@?@?(| \+ 0)
 #pass
diff --git a/ld/testsuite/ld-ifunc/pr23169c.rd b/ld/testsuite/ld-ifunc/pr23169c.rd
index ad364d4a53a..28f39b88ae1 100644
--- a/ld/testsuite/ld-ifunc/pr23169c.rd
+++ b/ld/testsuite/ld-ifunc/pr23169c.rd
@@ -1,3 +1,3 @@
 #...
- +[0-9]+: +[0-9a-f]+ +[0-9]+ +IFUNC +GLOBAL +DEFAULT.* [0-9]+ +func
+ +[0-9]+: +[0-9a-f]+ +[0-9]+ +IFUNC +GLOBAL +DEFAULT.* [0-9]+ +func@?@?
 #pass
diff --git a/ld/testsuite/ld-plugin/pr22983.1.d b/ld/testsuite/ld-plugin/pr22983.1.d
index a351e8848f1..d1dd28e9d85 100644
--- a/ld/testsuite/ld-plugin/pr22983.1.d
+++ b/ld/testsuite/ld-plugin/pr22983.1.d
@@ -1,6 +1,6 @@
 Symbol table '\.dynsym' contains [0-9]+ entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
 #...
- +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +OBJECT +GLOBAL +DEFAULT .*[0-9]+ _?var_attr_used_enabled
+ +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +OBJECT +GLOBAL +DEFAULT .*[0-9]+ _?var_attr_used_enabled@?@?
 #pass
 
diff --git a/ld/testsuite/ld-plugin/pr22983.2.d b/ld/testsuite/ld-plugin/pr22983.2.d
index 10589169b87..063c6af3cf1 100644
--- a/ld/testsuite/ld-plugin/pr22983.2.d
+++ b/ld/testsuite/ld-plugin/pr22983.2.d
@@ -1,6 +1,6 @@
 Symbol table '\.dynsym' contains [0-9]+ entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
 #...
- +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +OBJECT +GLOBAL +DEFAULT .*[0-9]+ _?var_attr_used_disabled
+ +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +OBJECT +GLOBAL +DEFAULT .*[0-9]+ _?var_attr_used_disabled@?@?
 #pass
 
diff --git a/ld/testsuite/ld-plugin/pr22983.3.d b/ld/testsuite/ld-plugin/pr22983.3.d
index 396a317eb22..0ca0aabff50 100644
--- a/ld/testsuite/ld-plugin/pr22983.3.d
+++ b/ld/testsuite/ld-plugin/pr22983.3.d
@@ -1,5 +1,5 @@
 Symbol table '\.dynsym' contains [0-9]+ entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
 #...
- +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +FUNC +GLOBAL +DEFAULT .*[0-9]+ _?func_attr_used_enabled
+ +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +FUNC +GLOBAL +DEFAULT .*[0-9]+ _?func_attr_used_enabled@?@?
 #pass
diff --git a/ld/testsuite/ld-plugin/pr22983.4.d b/ld/testsuite/ld-plugin/pr22983.4.d
index 6dade057402..1138a37b18a 100644
--- a/ld/testsuite/ld-plugin/pr22983.4.d
+++ b/ld/testsuite/ld-plugin/pr22983.4.d
@@ -1,5 +1,5 @@
 Symbol table '\.dynsym' contains [0-9]+ entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
 #...
- +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +FUNC +GLOBAL +DEFAULT .*[0-9]+ _?func_attr_used_disabled
+ +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +FUNC +GLOBAL +DEFAULT .*[0-9]+ _?func_attr_used_disabled@?@?
 #pass
-- 
2.48.1

More information about the Binutils mailing list