From 99c262f8b0b724b4132b3f6859945dc0ec14b822 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Sat, 12 Jun 1999 10:47:08 +0000
Subject: [PATCH] 	* ld-scripts/phdrs.exp: Change target check from
 "*-*-linuxaout*" 	to "*-*-linux*aout*". 	* ld-scripts/weak.exp:
 Likewise. 	* ld-shared/shared.exp: Likewise.  Simplify condition a bit.

---
 ld/testsuite/ChangeLog            | 7 +++++++
 ld/testsuite/ld-scripts/phdrs.exp | 4 ++--
 ld/testsuite/ld-scripts/weak.exp  | 4 ++--
 ld/testsuite/ld-shared/shared.exp | 9 ++-------
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index ff12750626f..763d63b68d0 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+1999-06-12  Ian Lance Taylor  <ian@zembu.com>
+
+	* ld-scripts/phdrs.exp: Change target check from "*-*-linuxaout*"
+	to "*-*-linux*aout*".
+	* ld-scripts/weak.exp: Likewise.
+	* ld-shared/shared.exp: Likewise.  Simplify condition a bit.
+
 Wed Jun  9 12:02:33 1999  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
 
 	* ld-cdtest/cdtest-main.cc: Avoid `implicit int' warning.
diff --git a/ld/testsuite/ld-scripts/phdrs.exp b/ld/testsuite/ld-scripts/phdrs.exp
index 34ee00f899c..5a37fa0e1fc 100644
--- a/ld/testsuite/ld-scripts/phdrs.exp
+++ b/ld/testsuite/ld-scripts/phdrs.exp
@@ -13,8 +13,8 @@ if { ![istarget *-*-sysv4*] \
     return
 }
 
-if { [istarget *-*-linuxaout*] \
-     || [istarget *-*-linuxoldld*] } {
+if { [istarget *-*-linux*aout*] \
+     || [istarget *-*-linux*oldld*] } {
     return
 }
 
diff --git a/ld/testsuite/ld-scripts/weak.exp b/ld/testsuite/ld-scripts/weak.exp
index f69db5793cc..e965967d08b 100644
--- a/ld/testsuite/ld-scripts/weak.exp
+++ b/ld/testsuite/ld-scripts/weak.exp
@@ -17,8 +17,8 @@ if { ![istarget *-*-sysv4*] \
     return
 }
 
-if { [istarget *-*-linuxaout*] \
-     || [istarget *-*-linuxoldld*] } {
+if { [istarget *-*-linux*aout*] \
+     || [istarget *-*-linux*oldld*] } {
     return
 }
 
diff --git a/ld/testsuite/ld-shared/shared.exp b/ld/testsuite/ld-shared/shared.exp
index 8939c3d1928..f8f14799a84 100644
--- a/ld/testsuite/ld-shared/shared.exp
+++ b/ld/testsuite/ld-shared/shared.exp
@@ -52,13 +52,8 @@ if { ![istarget i386-*-sysv4*] \
     return
 }
 
-if { [istarget i386-*-linuxaout*] \
-     || [istarget i486-*-linuxaout*] \
-     || [istarget i586-*-linuxaout*] \
-     || [istarget i386-*-linuxoldld*] \
-     || [istarget i486-*-linuxoldld*] \
-     || [istarget i586-*-linuxoldld*] \
-     || [istarget m68k-*-linuxaout*] } {
+if { [istarget *-*-linux*aout*] \
+     || [istarget *-*-linux*oldld*] } {
     return
 }
 
-- 
2.30.2