From d04428bdb429aa7206e45f5273898b5918ae2f18 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Tue, 10 Jun 2003 13:31:59 +0000
Subject: [PATCH] 	* gas/cfi/cfi.exp: Use here.  Only run tests when ELF.
 	* gas/macros/and.s: Avoid .set so we don't break mips.

---
 gas/testsuite/ChangeLog        |  2 ++
 gas/testsuite/gas/cfi/cfi.exp  | 36 ++++++++++++---------------------
 gas/testsuite/lib/gas-defs.exp | 37 ++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 337226e9966..7eb65c17eae 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,7 @@
 2003-06-10  Alan Modra  <amodra@bigpond.net.au>
 
+	* lib/gas-defs.exp (proc is_elf_format): Copy from ld testsuite.
+	* gas/cfi/cfi.exp: Use here.  Only run tests when ELF.
 	* gas/macros/and.s: Avoid .set so we don't break mips.
 
 2003-06-10  Alan Modra  <amodra@bigpond.net.au>
diff --git a/gas/testsuite/gas/cfi/cfi.exp b/gas/testsuite/gas/cfi/cfi.exp
index 88baac25150..968d3b1918a 100644
--- a/gas/testsuite/gas/cfi/cfi.exp
+++ b/gas/testsuite/gas/cfi/cfi.exp
@@ -12,35 +12,25 @@ proc run_list_test { name opts } {
     pass $testname
 }
 
-set any "0"
+if ![is_elf_format] then {
+    return
+}
 
 if [istarget "x86_64-*"] then {
     run_dump_test "cfi-x86_64"
-    set any "1"
-}
 
-if [istarget "i?86-*"] then {
+} elseif [istarget "i?86-*"] then {
     run_dump_test "cfi-i386"
-    set any "1"
-}
 
-if { [istarget alpha*-*-*] } then {
+} elseif { [istarget alpha*-*-*] } then {
+    run_dump_test "cfi-alpha-1"
+    run_dump_test "cfi-alpha-2"
+    run_dump_test "cfi-alpha-3"
 
-    set elf [expr [istarget *-*-elf*] \
-                  || [istarget *-*-linux*] \
-                  || [istarget *-*-freebsd*] \
-                  || [istarget *-*-netbsd*] ]
-
-    if $elf {
-	run_dump_test "cfi-alpha-1"
-	run_dump_test "cfi-alpha-2"
-	run_dump_test "cfi-alpha-3"
-	set any "1"
-    }
+} else {
+    return
 }
 
-if $any {
-    run_list_test "cfi-diag-1" ""
-    run_dump_test "cfi-common-1"
-    run_dump_test "cfi-common-2"
-}
+run_list_test "cfi-diag-1" ""
+run_dump_test "cfi-common-1"
+run_dump_test "cfi-common-2"
diff --git a/gas/testsuite/lib/gas-defs.exp b/gas/testsuite/lib/gas-defs.exp
index 5a3af8c0394..c82bd8ab023 100644
--- a/gas/testsuite/lib/gas-defs.exp
+++ b/gas/testsuite/lib/gas-defs.exp
@@ -182,6 +182,43 @@ proc gas_init { args } {
     return
 }
 
+#
+# is_elf_format
+#	true if the object format is known to be ELF
+#
+proc is_elf_format {} {
+    if { ![istarget *-*-sysv4*] \
+	 && ![istarget *-*-unixware*] \
+	 && ![istarget *-*-elf*] \
+	 && ![istarget *-*-eabi*] \
+	 && ![istarget hppa*64*-*-hpux*] \
+	 && ![istarget *-*-linux*] \
+	 && ![istarget *-*-irix5*] \
+	 && ![istarget *-*-irix6*] \
+	 && ![istarget *-*-netbsd*] \
+	 && ![istarget *-*-solaris2*] } {
+	return 0
+    }
+
+    if { [istarget *-*-linux*aout*] \
+	 || [istarget *-*-linux*oldld*] } {
+	return 0
+    }
+
+    if { ![istarget *-*-netbsdelf*] \
+	 && ([istarget *-*-netbsd*aout*] \
+	     || [istarget *-*-netbsdpe*] \
+	     || [istarget arm*-*-netbsd*] \
+	     || [istarget sparc-*-netbsd*] \
+	     || [istarget i*86-*-netbsd*] \
+	     || [istarget m68*-*-netbsd*] \
+	     || [istarget vax-*-netbsd*] \
+	     || [istarget ns32k-*-netbsd*]) } {
+    	return 0
+    }
+    return 1
+}
+
 
 # run_dump_test FILE (optional:) EXTRA_OPTIONS
 #
-- 
2.30.2