diff options
| author | Alan Modra <amodra@gmail.com> | 2013-10-31 19:33:23 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2013-11-15 15:50:20 +1030 |
| commit | ad361505df3a6bb5b6267f930f89f5e08c7e38c1 (patch) | |
| tree | 3850f4111639101e027a20d4979acc6475db7ec0 /ld | |
| parent | c17f12ce29fd4e3789e2bc276c4daabcedee5c5c (diff) | |
| download | ppe42-binutils-ad361505df3a6bb5b6267f930f89f5e08c7e38c1.tar.gz ppe42-binutils-ad361505df3a6bb5b6267f930f89f5e08c7e38c1.zip | |
Allow for extra st_other readelf output in ld testsuite
(cherry picked from commit 4115bfc68301edaca4dd1fd83eddeaafeda4c63c)
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/testsuite/ld-elfvers/vers24.rd | 4 | ||||
| -rw-r--r-- | ld/testsuite/ld-ifunc/ifunc.exp | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 0cda12afa5..8cd06b9050 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -2,6 +2,11 @@ Apply changes from mainline to 2.24 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 42e81e42d9..fb464f9f7a 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 1d64efcd67..fb106c6ed8 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 } |
