From: Alan Modra Date: Thu, 31 Oct 2013 09:03:23 +0000 (+1030) Subject: Allow for extra st_other readelf output in ld testsuite X-Git-Tag: binutils-2_24~47 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad361505df3a6bb5b6267f930f89f5e08c7e38c1;p=thirdparty%2Fbinutils-gdb.git Allow for extra st_other readelf output in ld testsuite (cherry picked from commit 4115bfc68301edaca4dd1fd83eddeaafeda4c63c) --- diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 0cda12afa50..8cd06b90501 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,6 +1,11 @@ 2013-11-15 Alan Modra Apply changes from mainline to 2.24 + 2013-11-04 Alan Modra + * ld-elfvers/vers24.rd: Allow extra readelf output after + symbol visibility. + * ld-ifunc/ifunc.exp: Likewise. + 2013-11-04 Alan Modra * ld-scripts/crossref.exp: Don't allow changes made to CFLAGS for this test to bleed into following tests. Don't set diff --git a/ld/testsuite/ld-elfvers/vers24.rd b/ld/testsuite/ld-elfvers/vers24.rd index 42e81e42d9c..fb464f9f7a6 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 1d64efcd678..fb106c6ed82 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 }