From ee58dd1ec5cfc8a91c5100c3f90bd81d4e1e10e4 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 5 May 2005 10:29:16 +0000 Subject: [PATCH] Replace linux-gnu with linux-* to allow for versions of Linux which do not use glibc. --- gas/testsuite/ChangeLog | 6 ++++++ gas/testsuite/gas/sh/basic.exp | 2 +- gas/testsuite/gas/vax/vax.exp | 4 ++-- ld/testsuite/ChangeLog | 6 ++++++ ld/testsuite/ld-sh/sh.exp | 6 +++--- ld/testsuite/ld-srec/srec.exp | 6 +++--- 6 files changed, 21 insertions(+), 9 deletions(-) diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index d49061a7d5a..fe18db2a3cc 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2005-05-05 Mike Frysinger + + * gas/sh/basic.exp: Replace linux-gnu with linux-* to allow for + versions of Linux which do not use glibc. + * gas/vax/vax.exp: Likewise. + 2005-05-05 Paul Brook * lib/gas-defs.exp (regexp_diff): Pass test if last line is "#...". diff --git a/gas/testsuite/gas/sh/basic.exp b/gas/testsuite/gas/sh/basic.exp index f16e48b0df7..13a90520efa 100644 --- a/gas/testsuite/gas/sh/basic.exp +++ b/gas/testsuite/gas/sh/basic.exp @@ -20,7 +20,7 @@ # Written by Cygnus Support. -if [istarget "sh*-*-linux-gnu"] { +if [istarget "sh*-*-linux-*"] { global ASFLAGS set ASFLAGS "$ASFLAGS -big" } diff --git a/gas/testsuite/gas/vax/vax.exp b/gas/testsuite/gas/vax/vax.exp index d1b998698aa..bfe9f8aca35 100644 --- a/gas/testsuite/gas/vax/vax.exp +++ b/gas/testsuite/gas/vax/vax.exp @@ -8,7 +8,7 @@ proc do_quad {} { set x2 0 set x3 0 set file "quad.s" - if { [istarget vax-*-*elf*] || [istarget vax-*-linux-gnu*] } then { + if { [istarget vax-*-*elf*] || [istarget vax-*-linux-*] } then { set file "quad_elf.s" } gas_start $file "-al" @@ -31,7 +31,7 @@ if [istarget vax-*-* ] then { run_dump_test "flonum" - if { [istarget vax-*-*elf*] || [istarget vax-*-linux-gnu*] } then { + if { [istarget vax-*-*elf*] || [istarget vax-*-linux-*] } then { run_dump_test "elf-rel" } } diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 5e37a91d167..2699c67d62c 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2005-05-05 Mike Frysinger + + * ld-srec/srec.exp: Replace linux-gnu with linux-* to allow for + versions of Linux which do not use glibc. + * ld-sh/sh.exp: Likewise + 2005-05-05 Paul Brook * lib/ld-lib.exp (regexp_diff): Pass test if last line is "#...". diff --git a/ld/testsuite/ld-sh/sh.exp b/ld/testsuite/ld-sh/sh.exp index 9929e3aafd4..5d3d5d4de77 100644 --- a/ld/testsuite/ld-sh/sh.exp +++ b/ld/testsuite/ld-sh/sh.exp @@ -14,7 +14,7 @@ # # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. # # Written by Ian Lance Taylor (ian@cygnus.com) # @@ -62,7 +62,7 @@ if ![ld_assemble $as "-relax $srcdir/$subdir/sh1.s" tmpdir/sh1.o] { set testsrec "SH relaxing to S-records" -if [istarget sh*-linux-gnu] { +if [istarget sh*-linux-*] { # This target needs the explicit entry address. catch "exec $objdump -x tmpdir/sh1 | grep start\\ address | sed s/start\\ address//" entry_addr set srec_relax_arg "-Ttext $entry_addr -relax --oformat srec tmpdir/sh1.o" @@ -117,7 +117,7 @@ if { [which $CC] == 0 } { return } -if [istarget sh*-linux-gnu] { +if [istarget sh*-linux-*] { exec sed -e s/_main/main/ -e s/_trap/trap/ -e s/_stack/stack/ \ < $srcdir/$subdir/start.s >tmpdir/start.s } else { diff --git a/ld/testsuite/ld-srec/srec.exp b/ld/testsuite/ld-srec/srec.exp index 55bca29d999..3b45a29c19b 100644 --- a/ld/testsuite/ld-srec/srec.exp +++ b/ld/testsuite/ld-srec/srec.exp @@ -15,7 +15,7 @@ # # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. # Get the offset from an S-record line to the start of the data. @@ -385,7 +385,7 @@ setup_xfail "arm*-*-linux*" setup_xfail "v850*-*-elf" # The S-record linker doesn't handle Alpha Elf relaxation. -setup_xfail "alpha*-*-elf*" "alpha*-*-linux-gnu*" "alpha*-*-gnu*" +setup_xfail "alpha*-*-elf*" "alpha*-*-linux-*" "alpha*-*-gnu*" setup_xfail "alpha*-*-netbsd*" # The S-record linker hasn't any hope of coping with HPPA relocs. @@ -424,7 +424,7 @@ setup_xfail "strongarm*-*-*" setup_xfail "thumb-*-*" setup_xfail "powerpc*-*-eabi*" setup_xfail "v850*-*-elf" -setup_xfail "alpha*-*-elf*" "alpha*-*-linux-gnu*" "alpha*-*-gnu*" +setup_xfail "alpha*-*-elf*" "alpha*-*-linux-*" "alpha*-*-gnu*" setup_xfail "alpha*-*-netbsd*" setup_xfail "hppa*-*-*" setup_xfail "ia64-*-*" -- 2.30.2