* lib/utils-lib.exp (is_elf_format): Merge with gas and ld versions.

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 5dcd6c8803b9f88723ed2ca57f92688dacdc4f4b..66977a8d3a7ad8d18024ef21c8aba5751fb2d9fd 100644 (file)
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-29  Alan Modra  <amodra@gmail.com>
+
+       * lib/utils-lib.exp (is_elf_format): Merge with gas and ld versions.
+
 2010-09-23  Alan Modra  <amodra@gmail.com>
 
        * binutils-all/ar.exp: Don't run unique_symbol on msp or hpux.

diff --git a/binutils/testsuite/lib/utils-lib.exp b/binutils/testsuite/lib/utils-lib.exp
index 11eb91079646e3ae8e13d36f10cb0dbe06c23f32..db170d387a51e429435e8a9fe089ff04887b03a6 100644 (file)
--- a/binutils/testsuite/lib/utils-lib.exp
+++ b/binutils/testsuite/lib/utils-lib.exp
@@ -118,41 +118,59 @@ proc default_binutils_assemble_flags { source object asflags } {
     }
 }
 
-#
-# is_elf_format
-#      true if the object format is known to be ELF
+# 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 ia64-*-hpux*] \
-        && ![istarget *-*-linux*] \
-        && ![istarget *-*-irix5*] \
-        && ![istarget *-*-irix6*] \
-        && ![istarget *-*-netbsd*] \
+    if { ![istarget *-*-sysv4*]
+        && ![istarget *-*-unixware*]
+        && ![istarget *-*-elf*]
+        && ![istarget *-*-eabi*]
+        && ![istarget *-*-rtems*]
+        && ![istarget hppa*64*-*-hpux*]
+        && ![istarget ia64-*-hpux*]
+        && ![istarget *-*-linux*]
+        && ![istarget frv-*-uclinux*]
+        && ![istarget bfin-*-uclinux]
+        && ![istarget sh*-*-uclinux*]
+        && ![istarget *-*-irix5*]
+        && ![istarget *-*-irix6*]
+        && ![istarget *-*-netbsd*]
+        && ![istarget *-*-openbsd*]
         && ![istarget *-*-solaris2*] } {
        return 0
     }
 
-    if { [istarget *-*-linux*aout*] \
-        || [istarget *-*-linux*oldld*] } {
+    if { [istarget *-*-linux*aout*]
+        || [istarget *-*-linux*oldld*]
+        || [istarget h8500-*-rtems*]
+        || [istarget i960-*-rtems*]
+        || [istarget *-*-rtemscoff*] } {
        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*] \
+    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
     }
+
+    if { [istarget arm-*-openbsd*]
+        || [istarget i386-*-openbsd\[0-2\].*]
+        || [istarget i386-*-openbsd3.\[0-2\]]
+        || [istarget m68*-*-openbsd*]
+        || [istarget ns32k-*-openbsd*]
+        || [istarget sparc-*-openbsd\[0-2\].*]
+        || [istarget sparc-*-openbsd3.\[0-1\]]
+        || [istarget vax-*-openbsd*] } {
+       return 0
+    }
+
     return 1
 }