Unnecessary load_lib in ld testsuite

ld-lib.exp is loaded in config/defaults.exp

	* testsuite/ld-scripts/include.exp: Don't load ld-lib.exp.
	* testsuite/ld-scripts/phdrs3.exp: Likewise.
	* testsuite/ld-scripts/rgn-at.exp: Likewise.
	* testsuite/ld-scripts/rgn-over.exp: Likewise.
	* testsuite/ld-scripts/sort.exp: Likewise.
	* testsuite/ld-discard/discard.exp: Likewise.  Use is_elf_format.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 5ecd26ad53467faf11f54590ccef73d9b389a93b..c6de0441d96d6d2846f728fa44df35d7af5d26a9 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,12 @@
+2020-06-15  Alan Modra  <amodra@gmail.com>
+
+       * testsuite/ld-scripts/include.exp: Don't load ld-lib.exp.
+       * testsuite/ld-scripts/phdrs3.exp: Likewise.
+       * testsuite/ld-scripts/rgn-at.exp: Likewise.
+       * testsuite/ld-scripts/rgn-over.exp: Likewise.
+       * testsuite/ld-scripts/sort.exp: Likewise.
+       * testsuite/ld-discard/discard.exp: Likewise.  Use is_elf_format.
+
 2020-06-15  Alan Modra  <amodra@gmail.com>
 
        PR 26103

diff --git a/ld/testsuite/ld-discard/discard.exp b/ld/testsuite/ld-discard/discard.exp
index 52c7de632ab1ef0c02c32b9937156612ce948781..ad1ebf42089123934e49921f128b932155aa647d 100644 (file)
--- a/ld/testsuite/ld-discard/discard.exp
+++ b/ld/testsuite/ld-discard/discard.exp
@@ -25,17 +25,10 @@
 # Test for ELF here, so we don't have to qualify on ELF specifically
 # in every .d-file.
 
-if { ![istarget *-*-linux*]
-     && ![istarget *-*-gnu*]
-     && ![istarget *-*-nacl*]
-     && ![istarget hppa*64*-*-hpux*]
-     && ![istarget arm*-*-uclinuxfdpiceabi]
-     && ![istarget *-*-elf] } {
+if {  ![is_elf_format] } {
     return
 }
 
-load_lib ld-lib.exp
-
 set test_list [lsort [glob -nocomplain $srcdir/$subdir/*.d]]
 for { set i 0 } { $i < [llength $test_list] } { incr i } {
     # We need to strip the ".d", but can leave the dirname.

diff --git a/ld/testsuite/ld-scripts/include.exp b/ld/testsuite/ld-scripts/include.exp
index 39da5dfdeba6c1f49480f993304c553e9d011532..d74f30e6d76c23938d73053725505bef6fb658a9 100644 (file)
--- a/ld/testsuite/ld-scripts/include.exp
+++ b/ld/testsuite/ld-scripts/include.exp
@@ -18,8 +18,6 @@
 # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
 # MA 02110-1301, USA.
 
-load_lib ld-lib.exp
-
 if [is_aout_format] {
     return
 }

diff --git a/ld/testsuite/ld-scripts/phdrs3.exp b/ld/testsuite/ld-scripts/phdrs3.exp
index 24b7bc0285a5d3c11dd6cc93449eb78a6642018a..af91814fddb8fdb39da70e7a81231c4e4c9f48af 100644 (file)
--- a/ld/testsuite/ld-scripts/phdrs3.exp
+++ b/ld/testsuite/ld-scripts/phdrs3.exp
@@ -24,8 +24,6 @@ if ![is_elf_format] {
     return
 }
 
-load_lib ld-lib.exp
-
 set testname "PHDRS headers"
 
 set old_ldflags $LDFLAGS

diff --git a/ld/testsuite/ld-scripts/rgn-at.exp b/ld/testsuite/ld-scripts/rgn-at.exp
index c0308a0b466daca5a28c7470ff2555eadb31d247..2d246bed8586028322d4a671c3f9e938b2a07ac4 100644 (file)
--- a/ld/testsuite/ld-scripts/rgn-at.exp
+++ b/ld/testsuite/ld-scripts/rgn-at.exp
@@ -22,8 +22,6 @@ if ![is_elf_format] {
     return
 }
 
-load_lib ld-lib.exp
-
 set test_list [lsort [glob -nocomplain $srcdir/$subdir/rgn-at*.d]]
 foreach test_file $test_list {
     set test_name [file rootname $test_file]

diff --git a/ld/testsuite/ld-scripts/rgn-over.exp b/ld/testsuite/ld-scripts/rgn-over.exp
index 0985d1625363d7934a2847adcbcb7afb0135579f..d0ec26672ca3c438bedf7a3afb1c674906540381 100644 (file)
--- a/ld/testsuite/ld-scripts/rgn-over.exp
+++ b/ld/testsuite/ld-scripts/rgn-over.exp
@@ -22,8 +22,6 @@ if ![is_elf_format] {
     return
 }
 
-load_lib ld-lib.exp
-
 set old_ldflags $LDFLAGS
 if { [istarget spu*-*-*] } {
     set LDFLAGS "$LDFLAGS --no-overlays"

diff --git a/ld/testsuite/ld-scripts/sort.exp b/ld/testsuite/ld-scripts/sort.exp
index 0d6832ba697fa79af815bd9d15d744be14f95f7a..a57a58aaf8da8fb93e164d7e9f2c2f2a74d408c1 100644 (file)
--- a/ld/testsuite/ld-scripts/sort.exp
+++ b/ld/testsuite/ld-scripts/sort.exp
@@ -30,8 +30,6 @@ if [istarget "h8300-*-*"] {
   return
 }
 
-load_lib ld-lib.exp
-
 set sort_test_list [lsort [glob -nocomplain $srcdir/$subdir/sort*.d]]
 for { set i 0 } { $i < [llength $sort_test_list] } { incr i } {
     verbose [file rootname [lindex $sort_test_list $i]]