resolve conflicts

This commit is contained in:
gwr 1997-09-25 15:57:07 +00:00
parent 2996a000a1
commit ec75fa2d04
1 changed files with 0 additions and 4 deletions

View File

@ -506,7 +506,6 @@ extern const bfd_target bfd_elf32_sparc_vec;
extern const bfd_target bfd_elf64_big_generic_vec;
extern const bfd_target bfd_elf64_little_generic_vec;
extern const bfd_target bfd_elf64_sparc_vec;
extern const bfd_target bsd_ecoffalpha_little_vec;
extern const bfd_target demo_64_vec;
extern const bfd_target ecoff_big_vec;
extern const bfd_target ecoff_little_vec;
@ -662,9 +661,6 @@ const bfd_target * const bfd_target_vector[] = {
#endif
#if 0
&bfd_elf64_sparc_vec,
#endif
#ifdef BFD64
&bsd_ecoffalpha_little_vec,
#endif
/* We don't include cisco_core_vec. Although it has a magic number,
the magic number isn't at the beginning of the file, and thus