diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/testsuite/lib/ld-lib.exp | 118 |
2 files changed, 78 insertions, 46 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index b1c94be..11e36ad 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2010-09-29 Alan Modra <amodra@gmail.com> + + * lib/ld-lib.exp (is_elf_format): Merge with binutils and gas versions. + (is_aout_format): Update target list. + (is_pecoff_format): Remove unnecessary line continuation. + 2010-09-27 Andreas Krebbel <Andreas.Krebbel@de.ibm.com> * ld-s390/tlsbin.dd: bcr 0,%r7 -> nopr %r7. diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index 9f2e249..a586fba 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -399,38 +399,56 @@ proc ld_simple_link_defsyms {} { # True if the object format is known to be ELF. # proc is_elf_format {} { - if { ![istarget *-*-sysv4*] \ - && ![istarget *-*-unixware*] \ - && ![istarget *-*-elf*] \ - && ![istarget *-*-eabi*] \ - && ![istarget hppa*64*-*-hpux*] \ - && ![istarget *-*-linux*] \ - && ![istarget frv-*-uclinux*] \ - && ![istarget bfin-*-uclinux] \ - && ![istarget sh*-*-uclinux*] \ - && ![istarget *-*-irix5*] \ - && ![istarget *-*-irix6*] \ - && ![istarget *-*-netbsd*] \ + if { ![istarget *-*-sysv4*] + && ![istarget *-*-unixware*] + && ![istarget *-*-elf*] + && ![istarget *-*-eabi*] + && ![istarget *-*-rtems*] + && ![istarget hppa*64*-*-hpux*] + && ![istarget ia64-*-hpux*] + && ![istarget *-*-linux*] + && ![istarget frv-*-uclinux*] + && ![istarget bfin-*-uclinux] + && ![istarget sh*-*-uclinux*] + && ![istarget *-*-irix5*] + && ![istarget *-*-irix6*] + && ![istarget *-*-netbsd*] + && ![istarget *-*-openbsd*] && ![istarget *-*-solaris2*] } { return 0 } - if { [istarget *-*-linux*aout*] \ - || [istarget *-*-linux*oldld*] } { + if { [istarget *-*-linux*aout*] + || [istarget *-*-linux*oldld*] + || [istarget h8500-*-rtems*] + || [istarget i960-*-rtems*] + || [istarget *-*-rtemscoff*] } { return 0 } - if { ![istarget *-*-netbsdelf*] \ - && ([istarget *-*-netbsd*aout*] \ - || [istarget *-*-netbsdpe*] \ - || [istarget arm*-*-netbsd*] \ - || [istarget sparc-*-netbsd*] \ - || [istarget i*86-*-netbsd*] \ - || [istarget m68*-*-netbsd*] \ - || [istarget vax-*-netbsd*] \ + if { ![istarget *-*-netbsdelf*] + && ([istarget *-*-netbsd*aout*] + || [istarget *-*-netbsdpe*] + || [istarget arm*-*-netbsd*] + || [istarget sparc-*-netbsd*] + || [istarget i*86-*-netbsd*] + || [istarget m68*-*-netbsd*] + || [istarget vax-*-netbsd*] || [istarget ns32k-*-netbsd*]) } { return 0 } + + if { [istarget arm-*-openbsd*] + || [istarget i386-*-openbsd\[0-2\].*] + || [istarget i386-*-openbsd3.\[0-2\]] + || [istarget m68*-*-openbsd*] + || [istarget ns32k-*-openbsd*] + || [istarget sparc-*-openbsd\[0-2\].*] + || [istarget sparc-*-openbsd3.\[0-1\]] + || [istarget vax-*-openbsd*] } { + return 0 + } + return 1 } @@ -462,27 +480,35 @@ proc is_elf64 { binary_file } { # True if the object format is known to be a.out. # proc is_aout_format {} { - if { [istarget *-*-*\[ab\]out*] \ - || [istarget *-*-linux*oldld*] \ - || [istarget *-*-msdos*] \ - || [istarget arm-*-netbsd] \ - || [istarget i?86-*-netbsd] \ - || [istarget i?86-*-mach*] \ - || [istarget i?86-*-vsta] \ - || [istarget pdp11-*-*] \ - || [istarget m68*-ericsson-ose] \ - || [istarget m68k-hp-bsd*] \ - || [istarget m68*-*-hpux*] \ - || [istarget m68*-*-netbsd] \ - || [istarget m68*-*-netbsd*4k*] \ - || [istarget m68k-sony-*] \ - || [istarget m68*-sun-sunos\[34\]*] \ - || [istarget m68*-wrs-vxworks*] \ - || [istarget ns32k-*-*] \ - || [istarget sparc*-*-netbsd] \ - || [istarget sparc-sun-sunos4*] \ - || [istarget vax-dec-ultrix*] \ - || [istarget vax-*-netbsd] } { + if { [istarget *-*-netbsdelf] + || [istarget sparc64-*-netbsd*] + || [istarget sparc64-*-openbsd*] } { + return 0 + } + if { [istarget *-*-*\[ab\]out*] + || [istarget *-*-linux*oldld*] + || [istarget *-*-bsd*] + || [istarget *-*-msdos*] + || [istarget arm-*-netbsd*] + || [istarget arm-*-openbsd*] + || [istarget arm-*-riscix*] + || [istarget i?86-*-freebsd\[12\]*] + || [istarget i?86-*-netbsd*] + || [istarget i?86-*-openbsd\[0-2\]*] + || [istarget i?86-*-openbsd3.\[0-2\]*] + || [istarget i?86-*-vsta] + || [istarget i?86-*-mach*] + || [istarget m68*-*-netbsd*] + || [istarget m68*-*-openbsd*] + || [istarget ns32k-*-*] + || [istarget pdp11-*-*] + || [istarget sparc*-*-sunos4*] + || [istarget sparc*-*-netbsd*] + || [istarget sparc*-*-openbsd\[0-2\]*] + || [istarget sparc*-*-openbsd3.\[0-1\]*] + || [istarget sparc*-fujitsu-none] + || [istarget vax-dec-ultrix*] + || [istarget vax-*-netbsd] } { return 1 } return 0 @@ -491,9 +517,9 @@ proc is_aout_format {} { # True if the object format is known to be PE COFF. # proc is_pecoff_format {} { - if { ![istarget *-*-mingw*] \ - && ![istarget *-*-cygwin*] \ - && ![istarget *-*-cegcc*] \ + if { ![istarget *-*-mingw*] + && ![istarget *-*-cygwin*] + && ![istarget *-*-cegcc*] && ![istarget *-*-pe*] } { return 0 } |