From 7e16ef34742d853239608fadde4a19f3a105b0a2 Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Mon, 25 May 2015 12:12:12 -0400 Subject: [PATCH] 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. --- binutils/testsuite/ChangeLog | 6 ++++++ binutils/testsuite/lib/binutils-common.exp | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog index 7d0b551b662..a572d42d4b2 100644 --- a/binutils/testsuite/ChangeLog +++ b/binutils/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2015-05-20 Ed Maste + + * 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 * 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 5dadc42a67c..c01b4935a95 100644 --- 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\]*] -- 2.30.2