From 1298463902e9c367c8a3751c11d9cc9ecd0b015b Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Mon, 15 Jun 2020 12:58:26 +0930
Subject: [PATCH] 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.
---
 ld/ChangeLog                         | 9 +++++++++
 ld/testsuite/ld-discard/discard.exp  | 9 +--------
 ld/testsuite/ld-scripts/include.exp  | 2 --
 ld/testsuite/ld-scripts/phdrs3.exp   | 2 --
 ld/testsuite/ld-scripts/rgn-at.exp   | 2 --
 ld/testsuite/ld-scripts/rgn-over.exp | 2 --
 ld/testsuite/ld-scripts/sort.exp     | 2 --
 7 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 5ecd26ad534..c6de0441d96 100644
--- 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 52c7de632ab..ad1ebf42089 100644
--- 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 39da5dfdeba..d74f30e6d76 100644
--- 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 24b7bc0285a..af91814fddb 100644
--- 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 c0308a0b466..2d246bed858 100644
--- 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 0985d162536..d0ec26672ca 100644
--- 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 0d6832ba697..a57a58aaf8d 100644
--- 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]]
-- 
2.30.2