From fbf18a5ce9c95b635a1fe81b3699fb2068a52225 Mon Sep 17 00:00:00 2001 From: Thiemo Seufer Date: Sat, 28 Jun 2003 22:14:59 +0000 Subject: [PATCH] * ld-mips-elf/mips-elf.exp: Use is_elf_format. --- ld/testsuite/ChangeLog | 4 + ld/testsuite/ld-mips-elf/mips-elf.exp | 102 +++++++++++++------------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index c41f75d3fec..a9ad45f4f7b 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2003-06-29 Thiemo Seufer + + * ld-mips-elf/mips-elf.exp: Use is_elf_format. + 2003-06-29 Thiemo Seufer * ld-mips-elf/mips-elf-flags.exp: Use -melf32bsmip for IRIX6. diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp index e0c593873f5..96739faea31 100644 --- a/ld/testsuite/ld-mips-elf/mips-elf.exp +++ b/ld/testsuite/ld-mips-elf/mips-elf.exp @@ -16,70 +16,66 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -if { [istarget mips*-*-*] } then { - set has_newabi [expr [istarget *-*-irix6*] || [istarget mips64*-*-linux*]] - - set elf [expr [istarget mips*-*-elf] || [istarget mips*-*-linux*] || \ - [istarget mips*-*-netbsd*] || [istarget mips*-*-irix*]] - set linux_gnu [expr [istarget mips*-*-linux*]] - set embedded_elf [expr [istarget mips*-*-elf]] +if {![istarget mips*-*-*] || ![is_elf_format]} { + return +} +set has_newabi [expr [istarget *-*-irix6*] || [istarget mips64*-*-linux*]] +set linux_gnu [expr [istarget mips*-*-linux*]] +set embedded_elf [expr [istarget mips*-*-elf]] - if { $elf } { - # Check MIPS16 markings being passed through link. - run_dump_test "mips16-1" - # MIPS branch offset final link checking. - run_dump_test "branch-misc-1" +# Check MIPS16 markings being passed through link. +run_dump_test "mips16-1" - # Test multi-got link. - run_dump_test "multi-got-1" - - if $has_newabi { - run_dump_test "elf-rel-got-n32" - run_dump_test "elf-rel-xgot-n32" - if { $linux_gnu } { - run_dump_test "elf-rel-got-n64-linux" - run_dump_test "elf-rel-xgot-n64-linux" - } else { - run_dump_test "elf-rel-got-n64" - run_dump_test "elf-rel-xgot-n64" - } +# MIPS branch offset final link checking. +run_dump_test "branch-misc-1" - run_dump_test "relax-jalr-n32" - run_dump_test "relax-jalr-n32-shared" - run_dump_test "relax-jalr-n64" - run_dump_test "relax-jalr-n64-shared" - } - } +# Test multi-got link. +run_dump_test "multi-got-1" +if $has_newabi { + run_dump_test "elf-rel-got-n32" + run_dump_test "elf-rel-xgot-n32" if { $linux_gnu } { - run_dump_test "rel32-o32" - run_dump_test "rel32-n32" - run_dump_test "rel64" + run_dump_test "elf-rel-got-n64-linux" + run_dump_test "elf-rel-xgot-n64-linux" + } else { + run_dump_test "elf-rel-got-n64" + run_dump_test "elf-rel-xgot-n64" } + run_dump_test "relax-jalr-n32" + run_dump_test "relax-jalr-n32-shared" + run_dump_test "relax-jalr-n64" + run_dump_test "relax-jalr-n64-shared" +} - if { $embedded_elf } { - # Check basic Embedded-PIC PC-relative HI/LO relocs. - run_dump_test "empic1-ln" - run_dump_test "empic1-lp" - run_dump_test "empic1-mn" - run_dump_test "empic1-mp" - run_dump_test "empic1-sn" - run_dump_test "empic1-sp" +if { $linux_gnu } { + run_dump_test "rel32-o32" + run_dump_test "rel32-n32" + run_dump_test "rel64" +} - # Embedded-PIC PC-relative HI/LO reloc edge-case regression tests. - # As of 2001-12-26, the linker botches the fwd-0 and rev-1 tests. - run_dump_test "empic2-fwd-0" - run_dump_test "empic2-fwd-1" - run_dump_test "empic2-rev-0" - run_dump_test "empic2-rev-1" +if { $embedded_elf } { + # Check basic Embedded-PIC PC-relative HI/LO relocs. + run_dump_test "empic1-ln" + run_dump_test "empic1-lp" + run_dump_test "empic1-mn" + run_dump_test "empic1-mp" + run_dump_test "empic1-sn" + run_dump_test "empic1-sp" - # Check generation of embedded relocs section. - run_dump_test "emrelocs-eb" - run_dump_test "emrelocs-el" + # Embedded-PIC PC-relative HI/LO reloc edge-case regression tests. + # As of 2001-12-26, the linker botches the fwd-0 and rev-1 tests. + run_dump_test "empic2-fwd-0" + run_dump_test "empic2-fwd-1" + run_dump_test "empic2-rev-0" + run_dump_test "empic2-rev-1" - run_dump_test "region1" - } + # Check generation of embedded relocs section. + run_dump_test "emrelocs-eb" + run_dump_test "emrelocs-el" + + run_dump_test "region1" } -- 2.30.2