From 257e20bc323b2479e80728752b49cb362689f4cf Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 30 Oct 2003 09:05:14 +0000 Subject: [PATCH] Remove separate vxworks stanza; merge withother common ELF triples. --- bfd/ChangeLog | 8 ++++++++ bfd/config.bfd | 23 +++++++++++++---------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 4ebc88ec742..b3d036394dd 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2003-10-30 Phil Edwards + + * config.bfd (arm-*-vxworks): Remove separate stanza; merge with + other common ELF triples. + (i[3-7]86-*-vxworks): Change to ELF format. + (mips*-*-windiss): New triple, add to common MIPS/ELF stanza. + (sh-*-vxworks): New stanza. + 2003-10-30 Lars Knoll Michael Matz Jakub Jelinek diff --git a/bfd/config.bfd b/bfd/config.bfd index cdf11a967eb..9f515380349 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -199,12 +199,6 @@ case "${targ}" in targ_defvec=aout_arm_big_vec targ_selvecs=aout_arm_little_vec ;; - arm-*-vxworks*) - targ_defvec=armcoff_little_vec - targ_selvecs=armcoff_big_vec - targ_underscore=yes - targ_cflags=-DARM_COFF_BUGFIX - ;; arm-*-coff) targ_defvec=armcoff_little_vec targ_selvecs=armcoff_big_vec @@ -222,7 +216,8 @@ case "${targ}" in targ_defvec=bfd_elf32_littlearm_vec targ_selvecs=bfd_elf32_bigarm_vec ;; - arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-conix* | arm*-*-uclinux* | arm-*-kfreebsd*-gnu) + arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-conix* | \ + arm*-*-uclinux* | arm-*-kfreebsd*-gnu | arm-*-vxworks) targ_defvec=bfd_elf32_littlearm_vec targ_selvecs=bfd_elf32_bigarm_vec ;; @@ -554,8 +549,8 @@ case "${targ}" in i[3-7]86-*-aout* | i[3-7]86*-*-vsta*) targ_defvec=i386aout_vec ;; - i[3-7]86-*-vxworks*) - targ_defvec=i386aout_vec + i[3-7]86-*-vxworks) + targ_defvec=bfd_elf32_i386_vec targ_underscore=yes ;; i[3-7]86-*-chaos) @@ -797,7 +792,7 @@ case "${targ}" in targ_defvec=bfd_elf32_littlemips_vec targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec" ;; - mips*-*-elf* | mips*-*-rtems* | mips*-*-vxworks*) + mips*-*-elf* | mips*-*-rtems* | mips*-*-vxworks | mips*-*-windiss) targ_defvec=bfd_elf32_bigmips_vec targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec" ;; @@ -1084,6 +1079,14 @@ case "${targ}" in targ_selvecs="shlpe_vec shlpei_vec" targ_underscore=yes ;; + sh-*-vxworks) + targ_defvec=bfd_elf32_sh_vec + targ_selvecs="bfd_elf32_shl_vec" + # FIXME None of the following are actually used on this target, but + # they're necessary for coff-sh.c (which is unconditionally used) to be + # compiled correctly. + targ_selvecs="$targ_selvecs shcoff_vec shlcoff_vec shcoff_small_vec shlcoff_small_vec" + ;; sh-*-* | sh-*-rtems*) targ_defvec=shcoff_vec targ_selvecs="shcoff_vec shlcoff_vec shcoff_small_vec shlcoff_small_vec" -- 2.30.2