diff options
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/testsuite/ChangeLog | 10 | ||||
| -rw-r--r-- | binutils/testsuite/binutils-all/elfedit-4.d | 1 | ||||
| -rw-r--r-- | binutils/testsuite/binutils-all/i386/i386.exp | 9 | ||||
| -rw-r--r-- | binutils/testsuite/binutils-all/x86-64/x86-64.exp | 10 | ||||
| -rw-r--r-- | binutils/testsuite/lib/binutils-common.exp | 3 |
5 files changed, 24 insertions, 9 deletions
diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog index bc33a5b2f6..db44b9209d 100644 --- a/binutils/testsuite/ChangeLog +++ b/binutils/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2012-04-03 Roland McGrath <mcgrathr@google.com> + + * lib/binutils-common.exp (is_elf_format): Consider *-*-nacl* to + be ELF too. + + * binutils-all/elfedit-4.d: Add "#as: --64" option. + + * binutils-all/i386/i386.exp: Accept nacl targets too. + * binutils-all/x86-64/x86-64.exp: Likewise. + 2012-03-13 Hans-Peter Nilsson <hp@axis.com> PR binutils/3807 diff --git a/binutils/testsuite/binutils-all/elfedit-4.d b/binutils/testsuite/binutils-all/elfedit-4.d index cc200447e1..4336dd8cfd 100644 --- a/binutils/testsuite/binutils-all/elfedit-4.d +++ b/binutils/testsuite/binutils-all/elfedit-4.d @@ -1,6 +1,7 @@ #PROG: elfedit #elfedit: --output-mach k1om #source: empty.s +#as: --64 #readelf: -h #name: Update ELF header 4 #target: x86_64-*-* diff --git a/binutils/testsuite/binutils-all/i386/i386.exp b/binutils/testsuite/binutils-all/i386/i386.exp index 5b33e67f2c..d06501a74a 100644 --- a/binutils/testsuite/binutils-all/i386/i386.exp +++ b/binutils/testsuite/binutils-all/i386/i386.exp @@ -1,23 +1,24 @@ -# Copyright 2010 +# Copyright 2010, 2012 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. if {!([istarget "i*86-*-linux*"] || [istarget "i*86-*-gnu*"] - || [istarget "x86_64-*-linux*"]) + || [istarget "i*86-*-nacl*"] + || [istarget "x86_64-*-nacl*"]) || ![is_elf_format] || [is_remote host]} then { return diff --git a/binutils/testsuite/binutils-all/x86-64/x86-64.exp b/binutils/testsuite/binutils-all/x86-64/x86-64.exp index 1934ca29f8..ccabc63527 100644 --- a/binutils/testsuite/binutils-all/x86-64/x86-64.exp +++ b/binutils/testsuite/binutils-all/x86-64/x86-64.exp @@ -1,21 +1,23 @@ -# Copyright 2010 +# Copyright 2010, 2012 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. -if {![istarget "x86_64-*-linux*"] || [is_remote host]} then { +if {!([istarget "x86_64-*-linux*"] + || [istarget "x86_64-*-nacl*"]) + || [is_remote host]} { return } diff --git a/binutils/testsuite/lib/binutils-common.exp b/binutils/testsuite/lib/binutils-common.exp index f9dcfd2edd..0054184eef 100644 --- a/binutils/testsuite/lib/binutils-common.exp +++ b/binutils/testsuite/lib/binutils-common.exp @@ -1,5 +1,5 @@ # Copyright 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2003, 2004, 2006, 2007, -# 2009, 2010, 2011 Free Software Foundation, Inc. +# 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # # This file is part of the GNU Binutils. # @@ -30,6 +30,7 @@ proc is_elf_format {} { && ![istarget ia64-*-hpux*] && ![istarget *-*-linux*] && ![istarget *-*-gnu*] + && ![istarget *-*-nacl*] && ![istarget frv-*-uclinux*] && ![istarget bfin-*-uclinux] && ![istarget sh*-*-uclinux*] |