aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@mips.com>2018-01-30 00:38:12 +0000
committerMaciej W. Rozycki <macro@mips.com>2018-01-30 00:38:12 +0000
commit822520337789f93b528fe0babc7dcfb03bb50fcd (patch)
tree21e86dd321a2b4f1009cbdae79b9d3694eb42360
parentf49db8befafd5a716a83fec75c90145c58af7418 (diff)
downloadgdb-822520337789f93b528fe0babc7dcfb03bb50fcd.zip
gdb-822520337789f93b528fe0babc7dcfb03bb50fcd.tar.gz
gdb-822520337789f93b528fe0babc7dcfb03bb50fcd.tar.bz2
MIPS/LD/testsuite: Adjust match patterns for special section indexes
Update `readelf' symbol table dump match patterns to handle SHN_MIPS_DATA and SHN_MIPS_TEXT special section indexes produced by the IRIX ELF format variation used with a number of MIPS targets and printed by `readelf' as PRC[0xff02] and PRC[0xff01] respectively, correcting LD test suite failures: extra regexps in .../ld/testsuite/ld-elf/comm-data1.sd starting with "^ +[0-9]+: +[0-9a-f]+ +0 +OBJECT +GLOBAL +DEFAULT +[0-9]+ +foo$" EOF from dump.out FAIL: Common symbol override test (auxiliary shared object build) extra regexps in .../ld/testsuite/ld-elf/pr21703-shared.sd starting with "^ +[0-9]+: +[0-9a-f]+ +4 +FUNC +GLOBAL +DEFAULT +[0-9] +foo@FOO$" EOF from dump.out FAIL: PR ld/21703 shared extra regexps in .../ld/testsuite/ld-elf/comm-data1.sd starting with "^ +[0-9]+: +[0-9a-f]+ +0 +OBJECT +GLOBAL +DEFAULT +[0-9]+ +foo$" EOF from dump.out FAIL: MIPS o32/copyreloc common symbol override test (auxiliary shared object build) extra regexps in .../ld/testsuite/ld-elf/comm-data1.sd starting with "^ +[0-9]+: +[0-9a-f]+ +0 +OBJECT +GLOBAL +DEFAULT +[0-9]+ +foo$" EOF from dump.out FAIL: MIPS o32/nocopyreloc common symbol override test (auxiliary shared object build) observed due to file contents like: 7: 5ffe02e8 0 OBJECT GLOBAL DEFAULT PRC[0xff02] foo shown by `readelf -s' vs: +[0-9]+: +[0-9a-f]+ +0 +OBJECT +GLOBAL +DEFAULT +[0-9]+ +foo pattern expected, triggered by widening testing to these targets by commit 05a5feafdd38 ("Rewrite check_shared_lib_support"). ld/ * testsuite/ld-elf/comm-data1.sd: Alternatively accept `PRC[0xff02]' in place of a regular section index. * testsuite/ld-elf/pr21703-shared.sd: Likewise `PRC[0xff01]'.
-rw-r--r--ld/ChangeLog6
-rw-r--r--ld/testsuite/ld-elf/comm-data1.sd4
-rw-r--r--ld/testsuite/ld-elf/pr21703-shared.sd4
3 files changed, 10 insertions, 4 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index a90dcb8..ad05c54 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-30 Maciej W. Rozycki <macro@mips.com>
+
+ * testsuite/ld-elf/comm-data1.sd: Alternatively accept
+ `PRC[0xff02]' in place of a regular section index.
+ * testsuite/ld-elf/pr21703-shared.sd: Likewise `PRC[0xff01]'.
+
2018-01-29 Alan Modra <amodra@gmail.com>
* testsuite/ld-elf/pr21964-3a.c: New file.
diff --git a/ld/testsuite/ld-elf/comm-data1.sd b/ld/testsuite/ld-elf/comm-data1.sd
index d00435b..7d6507f 100644
--- a/ld/testsuite/ld-elf/comm-data1.sd
+++ b/ld/testsuite/ld-elf/comm-data1.sd
@@ -1,10 +1,10 @@
Symbol table '\.dynsym' contains [0-9]+ entries:
+Num: +Value +Size +Type +Bind +Vis +Ndx +Name
#...
- +[0-9]+: +[0-9a-f]+ +0 +OBJECT +GLOBAL +DEFAULT +[0-9]+ +foo
+ +[0-9]+: +[0-9a-f]+ +0 +OBJECT +GLOBAL +DEFAULT +(?:[0-9]+|PRC\[0xff02\]) +foo
#...
Symbol table '\.symtab' contains [0-9]+ entries:
+Num: +Value +Size +Type +Bind +Vis +Ndx +Name
#...
- +[0-9]+: +[0-9a-f]+ +0 +OBJECT +GLOBAL +DEFAULT +[0-9]+ +foo
+ +[0-9]+: +[0-9a-f]+ +0 +OBJECT +GLOBAL +DEFAULT +(?:[0-9]+|PRC\[0xff02\]) +foo
#pass
diff --git a/ld/testsuite/ld-elf/pr21703-shared.sd b/ld/testsuite/ld-elf/pr21703-shared.sd
index 9ca541c..79e67f7 100644
--- a/ld/testsuite/ld-elf/pr21703-shared.sd
+++ b/ld/testsuite/ld-elf/pr21703-shared.sd
@@ -1,11 +1,11 @@
Symbol table '\.dynsym' contains [0-9]+ entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
#...
- +[0-9]+: +[0-9a-f]+ +4 +FUNC +GLOBAL +DEFAULT +[0-9] +foo@FOO
+ +[0-9]+: +[0-9a-f]+ +4 +FUNC +GLOBAL +DEFAULT +(?:[0-9]+|PRC\[0xff01\]) +foo@FOO
#...
+[0-9]+: +[0-9a-f]+ +0 +OBJECT +GLOBAL +DEFAULT +ABS +FOO1
#...
- +[0-9]+: +[0-9a-f]+ +32 +FUNC +GLOBAL +DEFAULT +[0-9] +foo@@FOO1
+ +[0-9]+: +[0-9a-f]+ +32 +FUNC +GLOBAL +DEFAULT +(?:[0-9]+|PRC\[0xff01\]) +foo@@FOO1
#...
+[0-9]+: +[0-9a-f]+ +0 +OBJECT +GLOBAL +DEFAULT +ABS +FOO
#...