diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/testsuite/ld-ifunc/ifunc.exp | 14 | ||||
| -rw-r--r-- | ld/testsuite/ld-unique/unique.exp | 16 |
3 files changed, 21 insertions, 15 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 1d26639..bd2fdf5 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2011-07-03 Samuel Thibault <samuel.thibault@gnu.org> + Thomas Schwinge <thomas@schwinge.name> + + * ld-ifunc/ifunc.exp: Update for changed output. + * ld-unique/unique.exp: Likewise. + 2011-06-27 Nick Clifton <nickc@redhat.com> * ld-elf/elf.exp: Exlcude all v850 targets from note-3 test. diff --git a/ld/testsuite/ld-ifunc/ifunc.exp b/ld/testsuite/ld-ifunc/ifunc.exp index 6c20dc0..60599ff 100644 --- a/ld/testsuite/ld-ifunc/ifunc.exp +++ b/ld/testsuite/ld-ifunc/ifunc.exp @@ -244,19 +244,19 @@ if { $fails == 0 } { # Check the executables and shared libraries # # The linked ifunc using executables and the shared library containing -# ifunc should have an OSABI field of LINUX. The linked non-ifunc using +# ifunc should have an OSABI field of GNU. The linked non-ifunc using # executable should have an OSABI field of NONE (aka System V). -if {! [check_osabi tmpdir/libshared_ifunc.so {UNIX - Linux}]} { - fail "Shared libraries containing ifunc does not have an OS/ABI field of LINUX" +if {! [check_osabi tmpdir/libshared_ifunc.so {UNIX - GNU}]} { + fail "Shared libraries containing ifunc does not have an OS/ABI field of GNU" set fails [expr $fails + 1] } -if {! [check_osabi tmpdir/local_prog {UNIX - Linux}]} { - fail "Local ifunc-using executable does not have an OS/ABI field of LINUX" +if {! [check_osabi tmpdir/local_prog {UNIX - GNU}]} { + fail "Local ifunc-using executable does not have an OS/ABI field of GNU" set fails [expr $fails + 1] } -if {! [check_osabi tmpdir/static_prog {UNIX - Linux}]} { - fail "Static ifunc-using executable does not have an OS/ABI field of LINUX" +if {! [check_osabi tmpdir/static_prog {UNIX - GNU}]} { + fail "Static ifunc-using executable does not have an OS/ABI field of GNU" set fails [expr $fails + 1] } if {! [check_osabi tmpdir/dynamic_prog {UNIX - System V}]} { diff --git a/ld/testsuite/ld-unique/unique.exp b/ld/testsuite/ld-unique/unique.exp index 4d73e32..d9e93ca 100644 --- a/ld/testsuite/ld-unique/unique.exp +++ b/ld/testsuite/ld-unique/unique.exp @@ -149,8 +149,8 @@ if { $fails != 0 } { } # Check the object file. -if {! [check_osabi tmpdir/unique.o {UNIX - Linux}]} { - fail "Object containing unique does not have an OS/ABI field of LINUX" +if {! [check_osabi tmpdir/unique.o {UNIX - GNU}]} { + fail "Object containing unique does not have an OS/ABI field of GNU" set fails [expr $fails + 1] } @@ -164,8 +164,8 @@ if { $fails == 0 } { } # Check the executable. -if {! [check_osabi tmpdir/unique_prog {UNIX - Linux}]} { - fail "Executable containing unique does not have an OS/ABI field of LINUX" +if {! [check_osabi tmpdir/unique_prog {UNIX - GNU}]} { + fail "Executable containing unique does not have an OS/ABI field of GNU" set fails [expr $fails + 1] } @@ -194,8 +194,8 @@ if { $fails == 0 } { } # Check the unique PIC file. -if {! [check_osabi tmpdir/unique_shared.o {UNIX - Linux}]} { - fail "PIC Object containing unique does not have an OS/ABI field of LINUX" +if {! [check_osabi tmpdir/unique_shared.o {UNIX - GNU}]} { + fail "PIC Object containing unique does not have an OS/ABI field of GNU" set fails [expr $fails + 1] } @@ -209,8 +209,8 @@ if { $fails == 0 } { } # Check the unique shared library. -if {! [check_osabi tmpdir/libunique_shared.so {UNIX - Linux}]} { - fail "Shared library containing unique does not have an OS/ABI field of LINUX" +if {! [check_osabi tmpdir/libunique_shared.so {UNIX - GNU}]} { + fail "Shared library containing unique does not have an OS/ABI field of GNU" set fails [expr $fails + 1] } |