aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2013-10-31 19:33:23 +1030
committerAlan Modra <amodra@gmail.com>2013-11-04 10:18:47 +1030
commit4115bfc68301edaca4dd1fd83eddeaafeda4c63c (patch)
treee77fc0ac6c0ee847e21496927cbb837f1d4d2158 /ld
parent14f2c476752f3cc4bfa7baee2a5a5183aafad975 (diff)
downloadfsf-binutils-gdb-4115bfc68301edaca4dd1fd83eddeaafeda4c63c.zip
fsf-binutils-gdb-4115bfc68301edaca4dd1fd83eddeaafeda4c63c.tar.gz
fsf-binutils-gdb-4115bfc68301edaca4dd1fd83eddeaafeda4c63c.tar.bz2
Allow for extra st_other readelf output in ld testsuite
On PowerPC64 ELFv2 readelf emits [<localentry>: 8] describing extra symbol st_other bits. * ld-elfvers/vers24.rd: Allow extra readelf output after symbol visibility. * ld-ifunc/ifunc.exp: Likewise.
Diffstat (limited to 'ld')
-rw-r--r--ld/testsuite/ChangeLog6
-rw-r--r--ld/testsuite/ld-elfvers/vers24.rd4
-rw-r--r--ld/testsuite/ld-ifunc/ifunc.exp3
3 files changed, 10 insertions, 3 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 213a909..01175a5 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,5 +1,11 @@
2013-11-04 Alan Modra <amodra@gmail.com>
+ * ld-elfvers/vers24.rd: Allow extra readelf output after
+ symbol visibility.
+ * ld-ifunc/ifunc.exp: Likewise.
+
+2013-11-04 Alan Modra <amodra@gmail.com>
+
* ld-scripts/crossref.exp: Don't allow changes made to CFLAGS
for this test to bleed into following tests. Don't set
-mcall-aixdesc for powerpc64le.
diff --git a/ld/testsuite/ld-elfvers/vers24.rd b/ld/testsuite/ld-elfvers/vers24.rd
index 42e81e4..fb464f9 100644
--- a/ld/testsuite/ld-elfvers/vers24.rd
+++ b/ld/testsuite/ld-elfvers/vers24.rd
@@ -7,9 +7,9 @@ Symbol table '.dynsym' contains [0-9]+ entries:
# And ensure the dynamic symbol table contains at least x@VERS.0
# and foo@@VERS.0 symbols
#...
- +[0-9]+: [0-9a-f]+ +(4 +OBJECT +GLOBAL +DEFAULT +[0-9]+ _?x|[0-9]+ +FUNC +GLOBAL +DEFAULT +[0-9]+ _?foo@)@VERS\.0
+ +[0-9]+: [0-9a-f]+ +(4 +OBJECT +GLOBAL +DEFAULT +[0-9]+ _?x|[0-9]+ +FUNC +GLOBAL +DEFAULT .* [0-9]+ _?foo@)@VERS\.0
#...
- +[0-9]+: [0-9a-f]+ +(4 +OBJECT +GLOBAL +DEFAULT +[0-9]+ _?x|[0-9]+ +FUNC +GLOBAL +DEFAULT +[0-9]+ _?foo@)@VERS\.0
+ +[0-9]+: [0-9a-f]+ +(4 +OBJECT +GLOBAL +DEFAULT +[0-9]+ _?x|[0-9]+ +FUNC +GLOBAL +DEFAULT .* [0-9]+ _?foo@)@VERS\.0
#...
Symbol table '.symtab' contains [0-9]+ entries:
#pass
diff --git a/ld/testsuite/ld-ifunc/ifunc.exp b/ld/testsuite/ld-ifunc/ifunc.exp
index 1d64efc..fb106c6 100644
--- a/ld/testsuite/ld-ifunc/ifunc.exp
+++ b/ld/testsuite/ld-ifunc/ifunc.exp
@@ -98,8 +98,9 @@ proc contains_ifunc_symbol { binary_file } {
# Look for a line like this:
# 58: 0000000000400600 30 IFUNC GLOBAL DEFAULT 12 library_func2
+ # with perhaps some other info between the visibility and section
- if { ![regexp ".*\[ \]*IFUNC\[ \]+GLOBAL\[ \]+DEFAULT\[ \]+\[UND0-9\]+\[ \]+library_func2\n" [file_contents readelf.out]] } {
+ if { ![regexp ".*\[ \]*IFUNC\[ \]+GLOBAL\[ \]+DEFAULT .* \[UND0-9\]+\[ \]+library_func2\n" [file_contents readelf.out]] } {
return 0
}