Recognize more targets as ELF for testing

Also use the correct rel strip-13 variant for more ARM targets.

	* testsuite/lib/binutils-common.exp (is_elf_format): Add chorus,
	cloudabi, fuchsia, kaos and nto.  Merge netbsdelf* into *elf*,
	and *uclinux* into *linux*.
	* testsuite/binutils-all/objcopy.exp: Accept armeb for rel
	strip-13 test, exclude arm-vxworks and arm-windiss.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 7235be257457cffac4761a46320dad92633edca9..81208509618f5455c61d03a85bba4490cfd26c74 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,11 @@
+2018-05-15  Alan Modra  <amodra@gmail.com>
+
+       * testsuite/lib/binutils-common.exp (is_elf_format): Add chorus,
+       cloudabi, fuchsia, kaos and nto.  Merge netbsdelf* into *elf*,
+       and *uclinux* into *linux*.
+       * testsuite/binutils-all/objcopy.exp: Accept armeb for rel
+       strip-13 test, exclude arm-vxworks and arm-windiss.
+
 2018-05-10  John Darrington  <john@darrington.wattle.id.au>
 
        * readelf.c (get_machine_name): EM_S12Z - handle new case.

diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp
index 33812369a43230c0649823d847fd3cafacbb763a..8d8b39909eb8e17a091d05a31b492b3946ae4375 100644 (file)
--- a/binutils/testsuite/binutils-all/objcopy.exp
+++ b/binutils/testsuite/binutils-all/objcopy.exp
@@ -1081,7 +1081,9 @@ if [is_elf_format] {
 
     if { [istarget "mips64*-*-openbsd*"] } {
        set reloc_format mips64
-    } elseif { [istarget "arm-*"] \
+    } elseif { ([istarget "arm*-*"] \
+               && ![istarget "*-*-vxworks"] \
+               && ![istarget "*-*-windiss"]) \
               || [istarget "d10v-*"] \
               || [istarget "dlx-*"] \
               || [istarget "i*86-*"] \

diff --git a/binutils/testsuite/lib/binutils-common.exp b/binutils/testsuite/lib/binutils-common.exp
index e6d9f40f1631ac5557f1bbe19bd8ce8c6ea9c250..9fc9a18dae290940304b2bb3cd24d022b1eda4de 100644 (file)
--- a/binutils/testsuite/lib/binutils-common.exp
+++ b/binutils/testsuite/lib/binutils-common.exp
@@ -26,32 +26,35 @@ proc is_elf_format {} {
     if { [istarget m68hc1*-*] || [istarget xgate-*] } {
        return 1;
     }
+# vxworks (and windiss) excluded due to number of ELF tests that need
+# modifying to pass on those targets.
+#       && ![istarget *-*-vxworks*]
+#       && ![istarget *-*-windiss*]
 
-    if {    ![istarget *-*-eabi*]
-        && ![istarget *-*-elf*]
-        && ![istarget *-*-freebsd*]
+    if {    ![istarget *-*-chorus*]
+        && ![istarget *-*-cloudabi*]
+        && ![istarget *-*-eabi*]
+        && ![istarget *-*-*elf*]
+        && ![istarget *-*-*freebsd*]
+        && ![istarget *-*-fuchsia*]
         && ![istarget *-*-gnu*]
         && ![istarget *-*-irix5*]
         && ![istarget *-*-irix6*]
-        && ![istarget *-*-linux*]
+        && ![istarget *-*-kaos*]
+        && ![istarget *-*-*linux*]
         && ![istarget *-*-lynxos*]
         && ![istarget *-*-nacl*]
         && ![istarget *-*-netbsd*]
+        && ![istarget *-*-nto*]
         && ![istarget *-*-openbsd*]
         && ![istarget *-*-rtems*]
         && ![istarget *-*-solaris2*]
-        && ![istarget *-*-symbianelf*]
         && ![istarget *-*-sysv4*]
         && ![istarget *-*-unixware*]
         && ![istarget *-*-wasm32*]
-        && ![istarget arm*-*-uclinuxfdpiceabi]
         && ![istarget avr-*-*]
-        && ![istarget bfin-*-uclinux]
-        && ![istarget frv-*-uclinux*]
         && ![istarget hppa*64*-*-hpux*]
-        && ![istarget ia64-*-hpux*]
-        && ![istarget sh*-*-uclinux*]
-        && ![istarget tic6x*-*-uclinux*] } {
+        && ![istarget ia64-*-hpux*] } {
        return 0
     }