ld testsuite fixes for alpha

Some tests failed just due to st_other info, eg. [NOPV], being
emitted by readelf or objdump.  Fix that.  Also since alpha doesn't
support ifunc, don't run the ifunc tests for alpha.

	* testsuite/ld-elf/dynamic-1.rd: Accept st_other notations.
	* testsuite/ld-elf/rdynamic-1.rd: Likewise.
	* testsuite/ld-elf/pr9676.rd: Likewise.
	* testsuite/ld-elf/pr9679.rd: Likewise.
	* testsuite/ld-elfvers/vers30.dsym: Likewise.
	* testsuite/ld-elfvers/vers31.dsym: Likewise.
	* testsuite/ld-plugin/pr22983.3.d: Likewise.
	* testsuite/ld-ifunc/ifunc.exp: Exclude alpha.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 7a6caa94af9ce5374b068e8a762760b50d2e0939..095eeab2a8bc0927dd748217ce8ae2816c3a7636 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,14 @@
+2020-06-19  Alan Modra  <amodra@gmail.com>
+
+       * testsuite/ld-elf/dynamic-1.rd: Accept st_other notations.
+       * testsuite/ld-elf/rdynamic-1.rd: Likewise.
+       * testsuite/ld-elf/pr9676.rd: Likewise.
+       * testsuite/ld-elf/pr9679.rd: Likewise.
+       * testsuite/ld-elfvers/vers30.dsym: Likewise.
+       * testsuite/ld-elfvers/vers31.dsym: Likewise.
+       * testsuite/ld-plugin/pr22983.3.d: Likewise.
+       * testsuite/ld-ifunc/ifunc.exp: Exclude alpha.
+
 2020-06-19  Alan Modra  <amodra@gmail.com>
 
        * emultempl/elf.em (gld${EMULATION_NAME}_handle_option): Omit

diff --git a/ld/testsuite/ld-elf/dynamic-1.rd b/ld/testsuite/ld-elf/dynamic-1.rd
index 2c2f23b06a3d83983267a54bbb3ec84e12bd2962..4dafd15a3f7d8fdb0b01c271dde9c486e44a5128 100644 (file)
--- a/ld/testsuite/ld-elf/dynamic-1.rd
+++ b/ld/testsuite/ld-elf/dynamic-1.rd
@@ -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]+ +_?dynamic
+ +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +FUNC +GLOBAL +DEFAULT .*[0-9]+ _?dynamic
 #...

diff --git a/ld/testsuite/ld-elf/pr9676.rd b/ld/testsuite/ld-elf/pr9676.rd
index 2d832dbe1e911a9384e38f4c0706607fd775a20d..f97e088cd028c9545a97a559502721ac229d5e0c 100644 (file)
--- a/ld/testsuite/ld-elf/pr9676.rd
+++ b/ld/testsuite/ld-elf/pr9676.rd
@@ -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 +LOCAL +DEFAULT +[0-9]+ +_?foo
+ +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +FUNC +LOCAL +DEFAULT .*[0-9]+ _?foo
 #...

diff --git a/ld/testsuite/ld-elf/pr9679.rd b/ld/testsuite/ld-elf/pr9679.rd
index 2d832dbe1e911a9384e38f4c0706607fd775a20d..f97e088cd028c9545a97a559502721ac229d5e0c 100644 (file)
--- a/ld/testsuite/ld-elf/pr9679.rd
+++ b/ld/testsuite/ld-elf/pr9679.rd
@@ -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 +LOCAL +DEFAULT +[0-9]+ +_?foo
+ +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +FUNC +LOCAL +DEFAULT .*[0-9]+ _?foo
 #...

diff --git a/ld/testsuite/ld-elf/rdynamic-1.rd b/ld/testsuite/ld-elf/rdynamic-1.rd
index dbf36021d1b432814b4c455e313260206c950f97..1daf3b2eb16e5aa5b995008bfc248fa0179ed9e5 100644 (file)
--- a/ld/testsuite/ld-elf/rdynamic-1.rd
+++ b/ld/testsuite/ld-elf/rdynamic-1.rd
@@ -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]+ +_?rdynamic
+ +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +FUNC +GLOBAL +DEFAULT .*[0-9]+ _?rdynamic
 #...

diff --git a/ld/testsuite/ld-elfvers/vers30.dsym b/ld/testsuite/ld-elfvers/vers30.dsym
index 5762f01843ccf6d31d7bef5287320a68e8ca975f..d80d7f3393a9183e40d7db6b26dd35db5c33a611 100644 (file)
--- a/ld/testsuite/ld-elfvers/vers30.dsym
+++ b/ld/testsuite/ld-elfvers/vers30.dsym
@@ -1,5 +1,5 @@
 0+ g    DO \*ABS\*     0+  VERS_30\.0   VERS_30\.0
-[0-9a-f]+ g    DF (\.text|\.opd|\*ABS\*)       [0-9a-f]+  VERS_30\.0   _?global
-[0-9a-f]+ g    DF (\.text|\.opd|\*ABS\*)       [0-9a-f]+  VERS_30\.0   _?foo
-[0-9a-f]+ g    DF (\.text|\.opd|\*ABS\*)       [0-9a-f]+  VERS_30\.0   _?info
-[0-9a-f]+ g    DF (\.text|\.opd|\*ABS\*)       [0-9a-f]+  VERS_30\.0   _?extern
+[0-9a-f]+ g    DF (\.text|\.opd|\*ABS\*)       [0-9a-f]+  VERS_30\.0 .* _?global
+[0-9a-f]+ g    DF (\.text|\.opd|\*ABS\*)       [0-9a-f]+  VERS_30\.0 .* _?foo
+[0-9a-f]+ g    DF (\.text|\.opd|\*ABS\*)       [0-9a-f]+  VERS_30\.0 .* _?info
+[0-9a-f]+ g    DF (\.text|\.opd|\*ABS\*)       [0-9a-f]+  VERS_30\.0 .* _?extern

diff --git a/ld/testsuite/ld-elfvers/vers31.dsym b/ld/testsuite/ld-elfvers/vers31.dsym
index fb22f5b87ca35c204a2b5f328ad1e9f496a1fb6b..b9ab2d104d3a4edb0d3886aa077fe2e7973381fe 100644 (file)
--- a/ld/testsuite/ld-elfvers/vers31.dsym
+++ b/ld/testsuite/ld-elfvers/vers31.dsym
@@ -1,2 +1,2 @@
 0+ g +DO \*ABS\*       0+ +VERS_31\.0 +VERS_31\.0
-[0-9a-f]+ g +DF (\.text|\.opd|\*ABS\*) [0-9a-f]+ +VERS_31\.0 +_?_Z1fIA3_icEvPT_T0
+[0-9a-f]+ g +DF (\.text|\.opd|\*ABS\*) [0-9a-f]+ +VERS_31\.0 .* _?_Z1fIA3_icEvPT_T0

diff --git a/ld/testsuite/ld-ifunc/ifunc.exp b/ld/testsuite/ld-ifunc/ifunc.exp
index ce3434b30fa33350682053b6800aec6c91276520..08cc87875c740fabb3e09e6737131832f6a9b7e5 100644 (file)
--- a/ld/testsuite/ld-ifunc/ifunc.exp
+++ b/ld/testsuite/ld-ifunc/ifunc.exp
@@ -24,6 +24,7 @@
 
 
 if { ![is_elf_format] || ![supports_gnu_osabi]
+     || [istarget alpha-*-*]
      || [istarget arc*-*-*]
      || [istarget am33*-*-*]
      || [istarget bfin-*-*]

diff --git a/ld/testsuite/ld-plugin/pr22983.3.d b/ld/testsuite/ld-plugin/pr22983.3.d
index 1bb4f2a4f21ad518c4b78f15d60b2fed74aa5704..396a317eb22fba5ab7defecbf614134a70ba38ae 100644 (file)
--- a/ld/testsuite/ld-plugin/pr22983.3.d
+++ b/ld/testsuite/ld-plugin/pr22983.3.d
@@ -1,6 +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
-