All FreeBSD targets are ELF except i?86-*-freebsd\[12\].*.

FreeBSD has used ELF for all targets for more than 15 years. Add
*-*-freebsd* except i?86-*-freebsd\[12\].* to is_elf_format. Update
is_aout_format to include a trailing dot, so that it does not match
freebsd-10.0 and later.

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 7d0b551b6627888ee4fda0e404a52c3cd1dbe011..a572d42d4b2e8685af47e934f8db92a3271755b6 100644 (file)
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-05-20  Ed Maste  <emaste@freebsd.org>
+
+       * lib/binutils-common.exp (is_elf_format): Include *-*-freebsd* except
+       i?86-*-freebsd\[12\].*.
+       * (is_aout_format): Update FreeBSD to i?86-*-freebsd\[12\].*.
+
 2015-05-18  Nick Clifton  <nickc@redhat.com>
 
        * binutils-all/dw2-3.S: Replace .int with .4byte.

diff --git a/binutils/testsuite/lib/binutils-common.exp b/binutils/testsuite/lib/binutils-common.exp
index 5dadc42a67c2efeef71a3dea6b4f714dcf14ffaa..c01b4935a95fd89fe5d98b7aa9fe411055986390 100644 (file)
--- a/binutils/testsuite/lib/binutils-common.exp
+++ b/binutils/testsuite/lib/binutils-common.exp
@@ -36,12 +36,17 @@ proc is_elf_format {} {
         && ![istarget tic6x*-*-uclinux*]
         && ![istarget *-*-irix5*]
         && ![istarget *-*-irix6*]
+        && ![istarget *-*-freebsd*]
         && ![istarget *-*-netbsd*]
         && ![istarget *-*-openbsd*]
         && ![istarget *-*-solaris2*] } {
        return 0
     }
 
+    if { [istarget i?86-*-freebsd\[12\].*] } {
+        return 0
+    }
+
     if { [istarget *-*-linux*aout*]
         || [istarget *-*-linux*ecoff*]
         || [istarget *-*-linux*oldld*]
@@ -92,7 +97,7 @@ proc is_aout_format {} {
         || [istarget arm-*-netbsd*]
         || [istarget arm-*-openbsd*]
         || [istarget arm-*-riscix*]
-        || [istarget i?86-*-freebsd\[12\]*]
+        || [istarget i?86-*-freebsd\[12\].*]
         || [istarget i?86-*-netbsd*]
         || [istarget i?86-*-openbsd\[0-2\]*]
         || [istarget i?86-*-openbsd3.\[0-2\]*]