* 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.
This commit is contained in:
Alan Modra
2010-09-29 06:06:00 +00:00
parent d6203a0e63
commit 98fc1c61b5
2 changed files with 78 additions and 46 deletions

View File

@ -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> 2010-09-27 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
* ld-s390/tlsbin.dd: bcr 0,%r7 -> nopr %r7. * ld-s390/tlsbin.dd: bcr 0,%r7 -> nopr %r7.

View File

@ -399,38 +399,56 @@ proc ld_simple_link_defsyms {} {
# True if the object format is known to be ELF. # True if the object format is known to be ELF.
# #
proc is_elf_format {} { proc is_elf_format {} {
if { ![istarget *-*-sysv4*] \ if { ![istarget *-*-sysv4*]
&& ![istarget *-*-unixware*] \ && ![istarget *-*-unixware*]
&& ![istarget *-*-elf*] \ && ![istarget *-*-elf*]
&& ![istarget *-*-eabi*] \ && ![istarget *-*-eabi*]
&& ![istarget hppa*64*-*-hpux*] \ && ![istarget *-*-rtems*]
&& ![istarget *-*-linux*] \ && ![istarget hppa*64*-*-hpux*]
&& ![istarget frv-*-uclinux*] \ && ![istarget ia64-*-hpux*]
&& ![istarget bfin-*-uclinux] \ && ![istarget *-*-linux*]
&& ![istarget sh*-*-uclinux*] \ && ![istarget frv-*-uclinux*]
&& ![istarget *-*-irix5*] \ && ![istarget bfin-*-uclinux]
&& ![istarget *-*-irix6*] \ && ![istarget sh*-*-uclinux*]
&& ![istarget *-*-netbsd*] \ && ![istarget *-*-irix5*]
&& ![istarget *-*-irix6*]
&& ![istarget *-*-netbsd*]
&& ![istarget *-*-openbsd*]
&& ![istarget *-*-solaris2*] } { && ![istarget *-*-solaris2*] } {
return 0 return 0
} }
if { [istarget *-*-linux*aout*] \ if { [istarget *-*-linux*aout*]
|| [istarget *-*-linux*oldld*] } { || [istarget *-*-linux*oldld*]
|| [istarget h8500-*-rtems*]
|| [istarget i960-*-rtems*]
|| [istarget *-*-rtemscoff*] } {
return 0 return 0
} }
if { ![istarget *-*-netbsdelf*] \ if { ![istarget *-*-netbsdelf*]
&& ([istarget *-*-netbsd*aout*] \ && ([istarget *-*-netbsd*aout*]
|| [istarget *-*-netbsdpe*] \ || [istarget *-*-netbsdpe*]
|| [istarget arm*-*-netbsd*] \ || [istarget arm*-*-netbsd*]
|| [istarget sparc-*-netbsd*] \ || [istarget sparc-*-netbsd*]
|| [istarget i*86-*-netbsd*] \ || [istarget i*86-*-netbsd*]
|| [istarget m68*-*-netbsd*] \ || [istarget m68*-*-netbsd*]
|| [istarget vax-*-netbsd*] \ || [istarget vax-*-netbsd*]
|| [istarget ns32k-*-netbsd*]) } { || [istarget ns32k-*-netbsd*]) } {
return 0 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 return 1
} }
@ -462,27 +480,35 @@ proc is_elf64 { binary_file } {
# True if the object format is known to be a.out. # True if the object format is known to be a.out.
# #
proc is_aout_format {} { proc is_aout_format {} {
if { [istarget *-*-*\[ab\]out*] \ if { [istarget *-*-netbsdelf]
|| [istarget *-*-linux*oldld*] \ || [istarget sparc64-*-netbsd*]
|| [istarget *-*-msdos*] \ || [istarget sparc64-*-openbsd*] } {
|| [istarget arm-*-netbsd] \ return 0
|| [istarget i?86-*-netbsd] \ }
|| [istarget i?86-*-mach*] \ if { [istarget *-*-*\[ab\]out*]
|| [istarget i?86-*-vsta] \ || [istarget *-*-linux*oldld*]
|| [istarget pdp11-*-*] \ || [istarget *-*-bsd*]
|| [istarget m68*-ericsson-ose] \ || [istarget *-*-msdos*]
|| [istarget m68k-hp-bsd*] \ || [istarget arm-*-netbsd*]
|| [istarget m68*-*-hpux*] \ || [istarget arm-*-openbsd*]
|| [istarget m68*-*-netbsd] \ || [istarget arm-*-riscix*]
|| [istarget m68*-*-netbsd*4k*] \ || [istarget i?86-*-freebsd\[12\]*]
|| [istarget m68k-sony-*] \ || [istarget i?86-*-netbsd*]
|| [istarget m68*-sun-sunos\[34\]*] \ || [istarget i?86-*-openbsd\[0-2\]*]
|| [istarget m68*-wrs-vxworks*] \ || [istarget i?86-*-openbsd3.\[0-2\]*]
|| [istarget ns32k-*-*] \ || [istarget i?86-*-vsta]
|| [istarget sparc*-*-netbsd] \ || [istarget i?86-*-mach*]
|| [istarget sparc-sun-sunos4*] \ || [istarget m68*-*-netbsd*]
|| [istarget vax-dec-ultrix*] \ || [istarget m68*-*-openbsd*]
|| [istarget vax-*-netbsd] } { || [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 1
} }
return 0 return 0
@ -491,9 +517,9 @@ proc is_aout_format {} {
# True if the object format is known to be PE COFF. # True if the object format is known to be PE COFF.
# #
proc is_pecoff_format {} { proc is_pecoff_format {} {
if { ![istarget *-*-mingw*] \ if { ![istarget *-*-mingw*]
&& ![istarget *-*-cygwin*] \ && ![istarget *-*-cygwin*]
&& ![istarget *-*-cegcc*] \ && ![istarget *-*-cegcc*]
&& ![istarget *-*-pe*] } { && ![istarget *-*-pe*] } {
return 0 return 0
} }