* gas/i386/i386.exp: Group ELF specific tests together. Move the pcrel

test into the ELF only section.  Use is_elf_format to test for ELF based
toolchains.

2 files changed, 13 insertions, 15 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 2c79c2d..a3338ef 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-26  Nick Clifton  <nickc@redhat.com>
+
+	* gas/i386/i386.exp: Group ELF specific tests together.  Move the
+	pcrel test into the ELF only section.  Use is_elf_format to test
+	for ELF based toolchains.
+
 2004-08-25  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* gas/all/gas.exp: Use `string match ""' instead of `eq ""'.
diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
index bfd7cd5..f95e2f4 100644
--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -54,38 +54,30 @@ if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]
     run_dump_test "ssemmx2"
     run_dump_test "sse2"
     run_dump_test "absrel"
-    run_dump_test "pcrel"
     run_dump_test "sub"
     run_dump_test "prescott"
     run_dump_test "divide"
     run_dump_test "padlock"
 
-    # PIC is only supported on ELF targets.
-    if { ([istarget "*-*-elf*"] || [istarget "*-*-linux*"] )
-	 && ![istarget *-*-linux*aout*]
-	 && ![istarget *-*-linux*oldld*] } then {
-	run_dump_test "intelpic"
-    }
-
     # These tests require support for 8 and 16 bit relocs,
     # so we only run them for ELF and COFF targets.
-    if {[istarget "*-*-elf*"] || [istarget "*-*-linux*"] || [istarget "*-*-coff*"]} then {
+    if {[is_elf_format] || [istarget "*-*-coff*"]} then {
 	run_dump_test "reloc"
 	run_dump_test "jump16"
 	run_list_test "white" "-al --listing-lhs-width=3"
     }
 
-    # Do they only work for ELF?
-    if { ([istarget "*-*-elf*"]		
-	  || [istarget "*-*-linux*"]
-	 && ![istarget *-*-linux*aout*]
-	 && ![istarget *-*-linux*oldld*])
-    } then {
+    # ELF specific tests
+    if [is_elf_format] then {
+	# PIC is only supported on ELF targets.
+	run_dump_test "intelpic"
+
 	run_dump_test "relax"
 	run_dump_test "gotpc"
 	run_dump_test "tlsd"
 	run_dump_test "tlspic"
 	run_dump_test "tlsnopic"
+	run_dump_test "pcrel"
     }
 
     # This is a PE specific test.