From 43f9d75bc1bbff5dec60756e9f12de5ae4a3d7dc Mon Sep 17 00:00:00 2001 From: Jason Thorpe Date: Thu, 29 May 2003 00:16:46 +0000 Subject: [PATCH] * ld-elf/elf.exp: Use if_elf_format. * ld-elf/sec64k.exp: Likewise. * ld-elfcomm/elfcomm.exp: Likewise. * lib/ld-lib.exp (is_elf_format): Match hppa*64*-*-hpux*. --- ld/testsuite/ChangeLog | 7 +++++++ ld/testsuite/ld-elf/elf.exp | 10 +--------- ld/testsuite/ld-elf/sec64k.exp | 10 +--------- ld/testsuite/ld-elfcomm/elfcomm.exp | 11 +---------- ld/testsuite/lib/ld-lib.exp | 1 + 5 files changed, 11 insertions(+), 28 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index c99047f47b..8c6dc9b36e 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2003-05-27 Jason Thorpe + + * ld-elf/elf.exp: Use if_elf_format. + * ld-elf/sec64k.exp: Likewise. + * ld-elfcomm/elfcomm.exp: Likewise. + * lib/ld-lib.exp (is_elf_format): Match hppa*64*-*-hpux*. + 2003-05-25 Jason Thorpe * ld-mips-elf/mips-elf.exp: Make all NetBSD targets match as elf. diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp index 1e2297164d..f975d42289 100644 --- a/ld/testsuite/ld-elf/elf.exp +++ b/ld/testsuite/ld-elf/elf.exp @@ -18,15 +18,7 @@ # Exclude non-ELF targets. -if { ![istarget *-*-linux*] \ - && ![istarget *-*-gnu] \ - && ![istarget hppa*64*-*-hpux*] \ - && ![istarget *-*-elf] } { - return -} - -if { [istarget *-*-linux*aout*] \ - || [istarget *-*-linux*oldld*] } { +if ![is_elf_format] { return } diff --git a/ld/testsuite/ld-elf/sec64k.exp b/ld/testsuite/ld-elf/sec64k.exp index bfc6d0fdcc..fe3e15ea82 100644 --- a/ld/testsuite/ld-elf/sec64k.exp +++ b/ld/testsuite/ld-elf/sec64k.exp @@ -20,15 +20,7 @@ # Exclude non-ELF targets. -if { ![istarget *-*-linux*] \ - && ![istarget *-*-gnu] \ - && ![istarget hppa*64*-*-hpux*] \ - && ![istarget *-*-elf] } { - return -} - -if { [istarget *-*-linux*aout*] \ - || [istarget *-*-linux*oldld*] } { +if ![is_elf_format] { return } diff --git a/ld/testsuite/ld-elfcomm/elfcomm.exp b/ld/testsuite/ld-elfcomm/elfcomm.exp index c9836c116f..88cfd898e4 100644 --- a/ld/testsuite/ld-elfcomm/elfcomm.exp +++ b/ld/testsuite/ld-elfcomm/elfcomm.exp @@ -21,16 +21,7 @@ # Make sure that ld correctly handles common symbols in ELF. # This test can only be run on ELF platforms. -# Square bracket expressions seem to confuse istarget. -if { ![istarget hppa*64*-*-hpux*] \ - && ![istarget *-*-gnu] \ - && ![istarget *-*-linux*] \ - && ![istarget *-*-elf] } { - return -} - -if { [istarget *-*-linux*aout*] \ - || [istarget *-*-linux*oldld*] } { +if ![is_elf_format] { return } diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index 89a748195e..23e4f698bd 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -349,6 +349,7 @@ proc is_elf_format {} { && ![istarget *-*-unixware*] \ && ![istarget *-*-elf*] \ && ![istarget *-*-eabi*] \ + && ![istarget hppa*64*-*-hpux*] \ && ![istarget *-*-linux*] \ && ![istarget *-*-irix5*] \ && ![istarget *-*-irix6*] \ -- 2.34.1