gdb: add target_ops::supports_displaced_step

[deliverable/binutils-gdb.git] / bfd / targets.c

diff --git a/bfd/targets.c b/bfd/targets.c
index 058ab7778124274038c49ac6d38bc9b02559a2a9..e5fc71a206ab59ee7cfe4fcad6fb594d3707b634 100644 (file)
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -1,5 +1,5 @@
 /* Generic target-file-type support for the BFD library.
 /* Generic target-file-type support for the BFD library.

-   Copyright (C) 1990-2014 Free Software Foundation, Inc.
+   Copyright (C) 1990-2020 Free Software Foundation, Inc.

    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.


@@ -144,15 +144,13 @@ DESCRIPTION
 
 .enum bfd_flavour
 .{
 
 .enum bfd_flavour
 .{

+.  {* N.B. Update bfd_flavour_name if you change this.  *}

 .  bfd_target_unknown_flavour,
 .  bfd_target_aout_flavour,
 .  bfd_target_coff_flavour,
 .  bfd_target_ecoff_flavour,
 .  bfd_target_xcoff_flavour,
 .  bfd_target_elf_flavour,
 .  bfd_target_unknown_flavour,
 .  bfd_target_aout_flavour,
 .  bfd_target_coff_flavour,
 .  bfd_target_ecoff_flavour,
 .  bfd_target_xcoff_flavour,
 .  bfd_target_elf_flavour,

-.  bfd_target_ieee_flavour,
-.  bfd_target_nlm_flavour,
-.  bfd_target_oasys_flavour,

 .  bfd_target_tekhex_flavour,
 .  bfd_target_srec_flavour,
 .  bfd_target_verilog_flavour,
 .  bfd_target_tekhex_flavour,
 .  bfd_target_srec_flavour,
 .  bfd_target_verilog_flavour,


@@ -178,10 +176,12 @@ DESCRIPTION
 .{* Forward declaration.  *}
 .typedef struct flag_info flag_info;
 .
 .{* Forward declaration.  *}
 .typedef struct flag_info flag_info;
 .

+.typedef void (*bfd_cleanup) (bfd *);
+.

 .typedef struct bfd_target
 .{
 .  {* Identifies the kind of target, e.g., SunOS4, Ultrix, etc.  *}
 .typedef struct bfd_target
 .{
 .  {* Identifies the kind of target, e.g., SunOS4, Ultrix, etc.  *}

-.  char *name;
+.  const char *name;

 .
 . {* The "flavour" of a back end is a general indication about
 .    the contents of a file.  *}
 .
 . {* The "flavour" of a back end is a general indication about
 .    the contents of a file.  *}


@@ -218,32 +218,33 @@ DESCRIPTION
 .  {* Entries for byte swapping for data. These are different from the
 .     other entry points, since they don't take a BFD as the first argument.
 .     Certain other handlers could do the same.  *}
 .  {* Entries for byte swapping for data. These are different from the
 .     other entry points, since they don't take a BFD as the first argument.
 .     Certain other handlers could do the same.  *}

-.  bfd_uint64_t   (*bfd_getx64) (const void *);
-.  bfd_int64_t    (*bfd_getx_signed_64) (const void *);
-.  void           (*bfd_putx64) (bfd_uint64_t, void *);
-.  bfd_vma        (*bfd_getx32) (const void *);
+.  bfd_uint64_t          (*bfd_getx64) (const void *);
+.  bfd_int64_t   (*bfd_getx_signed_64) (const void *);
+.  void                  (*bfd_putx64) (bfd_uint64_t, void *);
+.  bfd_vma       (*bfd_getx32) (const void *);

 .  bfd_signed_vma (*bfd_getx_signed_32) (const void *);
 .  bfd_signed_vma (*bfd_getx_signed_32) (const void *);

-.  void           (*bfd_putx32) (bfd_vma, void *);
-.  bfd_vma        (*bfd_getx16) (const void *);
+.  void                  (*bfd_putx32) (bfd_vma, void *);
+.  bfd_vma       (*bfd_getx16) (const void *);

 .  bfd_signed_vma (*bfd_getx_signed_16) (const void *);
 .  bfd_signed_vma (*bfd_getx_signed_16) (const void *);

-.  void           (*bfd_putx16) (bfd_vma, void *);
+.  void                  (*bfd_putx16) (bfd_vma, void *);

 .
 .  {* Byte swapping for the headers.  *}
 .
 .  {* Byte swapping for the headers.  *}

-.  bfd_uint64_t   (*bfd_h_getx64) (const void *);
-.  bfd_int64_t    (*bfd_h_getx_signed_64) (const void *);
-.  void           (*bfd_h_putx64) (bfd_uint64_t, void *);
-.  bfd_vma        (*bfd_h_getx32) (const void *);
+.  bfd_uint64_t          (*bfd_h_getx64) (const void *);
+.  bfd_int64_t   (*bfd_h_getx_signed_64) (const void *);
+.  void                  (*bfd_h_putx64) (bfd_uint64_t, void *);
+.  bfd_vma       (*bfd_h_getx32) (const void *);

 .  bfd_signed_vma (*bfd_h_getx_signed_32) (const void *);
 .  bfd_signed_vma (*bfd_h_getx_signed_32) (const void *);

-.  void           (*bfd_h_putx32) (bfd_vma, void *);
-.  bfd_vma        (*bfd_h_getx16) (const void *);
+.  void                  (*bfd_h_putx32) (bfd_vma, void *);
+.  bfd_vma       (*bfd_h_getx16) (const void *);

 .  bfd_signed_vma (*bfd_h_getx_signed_16) (const void *);
 .  bfd_signed_vma (*bfd_h_getx_signed_16) (const void *);

-.  void           (*bfd_h_putx16) (bfd_vma, void *);
+.  void                  (*bfd_h_putx16) (bfd_vma, void *);

 .
 .  {* Format dependent routines: these are vectors of entry points
 .     within the target vector structure, one for each format to check.  *}
 .
 .
 .  {* Format dependent routines: these are vectors of entry points
 .     within the target vector structure, one for each format to check.  *}
 .

-.  {* Check the format of a file being read.  Return a <<bfd_target *>> or zero.  *}
-.  const struct bfd_target *(*_bfd_check_format[bfd_type_end]) (bfd *);
+.  {* Check the format of a file being read.  Return a <<bfd_cleanup>> on
+.     success or zero on failure.  *}
+.  bfd_cleanup (*_bfd_check_format[bfd_type_end]) (bfd *);

 .
 .  {* Set the format of a file being written.  *}
 .  bfd_boolean (*_bfd_set_format[bfd_type_end]) (bfd *);
 .
 .  {* Set the format of a file being written.  *}
 .  bfd_boolean (*_bfd_set_format[bfd_type_end]) (bfd *);


@@ -269,10 +270,11 @@ BFD_JUMP_TABLE macros.
 .  {* Called when a new section is created.  *}
 .  bfd_boolean (*_new_section_hook) (bfd *, sec_ptr);
 .  {* Read the contents of a section.  *}
 .  {* Called when a new section is created.  *}
 .  bfd_boolean (*_new_section_hook) (bfd *, sec_ptr);
 .  {* Read the contents of a section.  *}

-.  bfd_boolean (*_bfd_get_section_contents)
-.    (bfd *, sec_ptr, void *, file_ptr, bfd_size_type);
-.  bfd_boolean (*_bfd_get_section_contents_in_window)
-.    (bfd *, sec_ptr, bfd_window *, file_ptr, bfd_size_type);
+.  bfd_boolean (*_bfd_get_section_contents) (bfd *, sec_ptr, void *, file_ptr,
+.                                           bfd_size_type);
+.  bfd_boolean (*_bfd_get_section_contents_in_window) (bfd *, sec_ptr,
+.                                                     bfd_window *, file_ptr,
+.                                                     bfd_size_type);

 .
 .  {* Entry points to copy private data.  *}
 .#define BFD_JUMP_TABLE_COPY(NAME) \
 .
 .  {* Entry points to copy private data.  *}
 .#define BFD_JUMP_TABLE_COPY(NAME) \


@@ -290,25 +292,26 @@ BFD_JUMP_TABLE macros.
 .  bfd_boolean (*_bfd_copy_private_bfd_data) (bfd *, bfd *);
 .  {* Called to merge BFD general private data from one object file
 .     to a common output file when linking.  *}
 .  bfd_boolean (*_bfd_copy_private_bfd_data) (bfd *, bfd *);
 .  {* Called to merge BFD general private data from one object file
 .     to a common output file when linking.  *}

-.  bfd_boolean (*_bfd_merge_private_bfd_data) (bfd *, bfd *);
+.  bfd_boolean (*_bfd_merge_private_bfd_data) (bfd *, struct bfd_link_info *);

 .  {* Called to initialize BFD private section data from one object file
 .     to another.  *}
 .#define bfd_init_private_section_data(ibfd, isec, obfd, osec, link_info) \
 .  {* Called to initialize BFD private section data from one object file
 .     to another.  *}
 .#define bfd_init_private_section_data(ibfd, isec, obfd, osec, link_info) \

-.  BFD_SEND (obfd, _bfd_init_private_section_data, (ibfd, isec, obfd, osec, link_info))
-.  bfd_boolean (*_bfd_init_private_section_data)
-.    (bfd *, sec_ptr, bfd *, sec_ptr, struct bfd_link_info *);
+.      BFD_SEND (obfd, _bfd_init_private_section_data, \
+.                (ibfd, isec, obfd, osec, link_info))
+.  bfd_boolean (*_bfd_init_private_section_data) (bfd *, sec_ptr, bfd *,
+.                                                sec_ptr,
+.                                                struct bfd_link_info *);

 .  {* Called to copy BFD private section data from one object file
 .     to another.  *}
 .  {* Called to copy BFD private section data from one object file
 .     to another.  *}

-.  bfd_boolean (*_bfd_copy_private_section_data)
-.    (bfd *, sec_ptr, bfd *, sec_ptr);
+.  bfd_boolean (*_bfd_copy_private_section_data) (bfd *, sec_ptr, bfd *,
+.                                                sec_ptr);

 .  {* Called to copy BFD private symbol data from one symbol
 .     to another.  *}
 .  {* Called to copy BFD private symbol data from one symbol
 .     to another.  *}

-.  bfd_boolean (*_bfd_copy_private_symbol_data)
-.    (bfd *, asymbol *, bfd *, asymbol *);
+.  bfd_boolean (*_bfd_copy_private_symbol_data) (bfd *, asymbol *, bfd *,
+.                                               asymbol *);

 .  {* Called to copy BFD private header data from one object file
 .     to another.  *}
 .  {* Called to copy BFD private header data from one object file
 .     to another.  *}

-.  bfd_boolean (*_bfd_copy_private_header_data)
-.    (bfd *, bfd *);
+.  bfd_boolean (*_bfd_copy_private_header_data) (bfd *, bfd *);

 .  {* Called to set private backend flags.  *}
 .  bfd_boolean (*_bfd_set_private_flags) (bfd *, flagword);
 .
 .  {* Called to set private backend flags.  *}
 .  bfd_boolean (*_bfd_set_private_flags) (bfd *, flagword);
 .


@@ -323,9 +326,9 @@ BFD_JUMP_TABLE macros.
 .  NAME##_core_file_pid
 .
 .  char *      (*_core_file_failing_command) (bfd *);
 .  NAME##_core_file_pid
 .
 .  char *      (*_core_file_failing_command) (bfd *);

-.  int         (*_core_file_failing_signal) (bfd *);
+.  int        (*_core_file_failing_signal) (bfd *);

 .  bfd_boolean (*_core_file_matches_executable_p) (bfd *, bfd *);
 .  bfd_boolean (*_core_file_matches_executable_p) (bfd *, bfd *);

-.  int         (*_core_file_pid) (bfd *);
+.  int        (*_core_file_pid) (bfd *);

 .
 .  {* Archive entry points.  *}
 .#define BFD_JUMP_TABLE_ARCHIVE(NAME) \
 .
 .  {* Archive entry points.  *}
 .#define BFD_JUMP_TABLE_ARCHIVE(NAME) \


@@ -343,17 +346,19 @@ BFD_JUMP_TABLE macros.
 .
 .  bfd_boolean (*_bfd_slurp_armap) (bfd *);
 .  bfd_boolean (*_bfd_slurp_extended_name_table) (bfd *);
 .
 .  bfd_boolean (*_bfd_slurp_armap) (bfd *);
 .  bfd_boolean (*_bfd_slurp_extended_name_table) (bfd *);

-.  bfd_boolean (*_bfd_construct_extended_name_table)
-.    (bfd *, char **, bfd_size_type *, const char **);
-.  void        (*_bfd_truncate_arname) (bfd *, const char *, char *);
-.  bfd_boolean (*write_armap)
-.    (bfd *, unsigned int, struct orl *, unsigned int, int);
+.  bfd_boolean (*_bfd_construct_extended_name_table) (bfd *, char **,
+.                                                    bfd_size_type *,
+.                                                    const char **);
+.  void               (*_bfd_truncate_arname) (bfd *, const char *, char *);
+.  bfd_boolean (*write_armap) (bfd *, unsigned int, struct orl *,
+.                             unsigned int, int);

 .  void *      (*_bfd_read_ar_hdr_fn) (bfd *);
 .  bfd_boolean (*_bfd_write_ar_hdr_fn) (bfd *, bfd *);
 .  bfd *       (*openr_next_archived_file) (bfd *, bfd *);
 .  void *      (*_bfd_read_ar_hdr_fn) (bfd *);
 .  bfd_boolean (*_bfd_write_ar_hdr_fn) (bfd *, bfd *);
 .  bfd *       (*openr_next_archived_file) (bfd *, bfd *);

-.#define bfd_get_elt_at_index(b,i) BFD_SEND (b, _bfd_get_elt_at_index, (b,i))
+.#define bfd_get_elt_at_index(b,i) \
+.      BFD_SEND (b, _bfd_get_elt_at_index, (b,i))

 .  bfd *       (*_bfd_get_elt_at_index) (bfd *, symindex);
 .  bfd *       (*_bfd_get_elt_at_index) (bfd *, symindex);

-.  int         (*_bfd_stat_arch_elt) (bfd *, struct stat *);
+.  int        (*_bfd_stat_arch_elt) (bfd *, struct stat *);

 .  bfd_boolean (*_bfd_update_armap_timestamp) (bfd *);
 .
 .  {* Entry points used for symbols.  *}
 .  bfd_boolean (*_bfd_update_armap_timestamp) (bfd *);
 .
 .  {* Entry points used for symbols.  *}


@@ -363,82 +368,86 @@ BFD_JUMP_TABLE macros.
 .  NAME##_make_empty_symbol, \
 .  NAME##_print_symbol, \
 .  NAME##_get_symbol_info, \
 .  NAME##_make_empty_symbol, \
 .  NAME##_print_symbol, \
 .  NAME##_get_symbol_info, \

+.  NAME##_get_symbol_version_string, \

 .  NAME##_bfd_is_local_label_name, \
 .  NAME##_bfd_is_target_special_symbol, \
 .  NAME##_get_lineno, \
 .  NAME##_find_nearest_line, \
 .  NAME##_bfd_is_local_label_name, \
 .  NAME##_bfd_is_target_special_symbol, \
 .  NAME##_get_lineno, \
 .  NAME##_find_nearest_line, \

-.  _bfd_generic_find_nearest_line_discriminator, \
-.  _bfd_generic_find_line, \
+.  NAME##_find_line, \

 .  NAME##_find_inliner_info, \
 .  NAME##_bfd_make_debug_symbol, \
 .  NAME##_read_minisymbols, \
 .  NAME##_minisymbol_to_symbol
 .
 .  NAME##_find_inliner_info, \
 .  NAME##_bfd_make_debug_symbol, \
 .  NAME##_read_minisymbols, \
 .  NAME##_minisymbol_to_symbol
 .

-.  long        (*_bfd_get_symtab_upper_bound) (bfd *);
-.  long        (*_bfd_canonicalize_symtab)
-.    (bfd *, struct bfd_symbol **);
+.  long               (*_bfd_get_symtab_upper_bound) (bfd *);
+.  long               (*_bfd_canonicalize_symtab) (bfd *, struct bfd_symbol **);

 .  struct bfd_symbol *
 .  struct bfd_symbol *

-.              (*_bfd_make_empty_symbol) (bfd *);
-.  void        (*_bfd_print_symbol)
-.    (bfd *, void *, struct bfd_symbol *, bfd_print_symbol_type);
-.#define bfd_print_symbol(b,p,s,e) BFD_SEND (b, _bfd_print_symbol, (b,p,s,e))
-.  void        (*_bfd_get_symbol_info)
-.    (bfd *, struct bfd_symbol *, symbol_info *);
-.#define bfd_get_symbol_info(b,p,e) BFD_SEND (b, _bfd_get_symbol_info, (b,p,e))
+.             (*_bfd_make_empty_symbol) (bfd *);
+.  void               (*_bfd_print_symbol) (bfd *, void *, struct bfd_symbol *,
+.                                   bfd_print_symbol_type);
+.#define bfd_print_symbol(b,p,s,e) \
+.      BFD_SEND (b, _bfd_print_symbol, (b,p,s,e))
+.  void               (*_bfd_get_symbol_info) (bfd *, struct bfd_symbol *,
+.                                      symbol_info *);
+.#define bfd_get_symbol_info(b,p,e) \
+.      BFD_SEND (b, _bfd_get_symbol_info, (b,p,e))
+.  const char *(*_bfd_get_symbol_version_string) (bfd *, struct bfd_symbol *,
+.                                                bfd_boolean,
+.                                                bfd_boolean *);
+.#define bfd_get_symbol_version_string(b,s,p,h) \
+.      BFD_SEND (b, _bfd_get_symbol_version_string, (b,s,p,h))

 .  bfd_boolean (*_bfd_is_local_label_name) (bfd *, const char *);
 .  bfd_boolean (*_bfd_is_target_special_symbol) (bfd *, asymbol *);
 .  alent *     (*_get_lineno) (bfd *, struct bfd_symbol *);
 .  bfd_boolean (*_bfd_is_local_label_name) (bfd *, const char *);
 .  bfd_boolean (*_bfd_is_target_special_symbol) (bfd *, asymbol *);
 .  alent *     (*_get_lineno) (bfd *, struct bfd_symbol *);

-.  bfd_boolean (*_bfd_find_nearest_line)
-.    (bfd *, struct bfd_section *, struct bfd_symbol **, bfd_vma,
-.     const char **, const char **, unsigned int *);
-.  bfd_boolean (*_bfd_find_nearest_line_discriminator)
-.    (bfd *, struct bfd_section *, struct bfd_symbol **, bfd_vma,
-.     const char **, const char **, unsigned int *, unsigned int *);
-.  bfd_boolean (*_bfd_find_line)
-.    (bfd *, struct bfd_symbol **, struct bfd_symbol *,
-.     const char **, unsigned int *);
+.  bfd_boolean (*_bfd_find_nearest_line) (bfd *, struct bfd_symbol **,
+.                                        struct bfd_section *, bfd_vma,
+.                                        const char **, const char **,
+.                                        unsigned int *, unsigned int *);
+.  bfd_boolean (*_bfd_find_line) (bfd *, struct bfd_symbol **,
+.                                struct bfd_symbol *, const char **,
+.                                unsigned int *);

 .  bfd_boolean (*_bfd_find_inliner_info)
 .    (bfd *, const char **, const char **, unsigned int *);
 . {* Back-door to allow format-aware applications to create debug symbols
 .    while using BFD for everything else.  Currently used by the assembler
 .    when creating COFF files.  *}
 .  bfd_boolean (*_bfd_find_inliner_info)
 .    (bfd *, const char **, const char **, unsigned int *);
 . {* Back-door to allow format-aware applications to create debug symbols
 .    while using BFD for everything else.  Currently used by the assembler
 .    when creating COFF files.  *}

-.  asymbol *   (*_bfd_make_debug_symbol)
-.    (bfd *, void *, unsigned long size);
+.  asymbol *   (*_bfd_make_debug_symbol) (bfd *, void *, unsigned long size);

 .#define bfd_read_minisymbols(b, d, m, s) \
 .#define bfd_read_minisymbols(b, d, m, s) \

-.  BFD_SEND (b, _read_minisymbols, (b, d, m, s))
-.  long        (*_read_minisymbols)
-.    (bfd *, bfd_boolean, void **, unsigned int *);
+.      BFD_SEND (b, _read_minisymbols, (b, d, m, s))
+.  long               (*_read_minisymbols) (bfd *, bfd_boolean, void **,
+.                                   unsigned int *);

 .#define bfd_minisymbol_to_symbol(b, d, m, f) \
 .#define bfd_minisymbol_to_symbol(b, d, m, f) \

-.  BFD_SEND (b, _minisymbol_to_symbol, (b, d, m, f))
-.  asymbol *   (*_minisymbol_to_symbol)
-.    (bfd *, bfd_boolean, const void *, asymbol *);
+.      BFD_SEND (b, _minisymbol_to_symbol, (b, d, m, f))
+.  asymbol *   (*_minisymbol_to_symbol) (bfd *, bfd_boolean, const void *,
+.                                       asymbol *);

 .
 .  {* Routines for relocs.  *}
 .#define BFD_JUMP_TABLE_RELOCS(NAME) \
 .  NAME##_get_reloc_upper_bound, \
 .  NAME##_canonicalize_reloc, \
 .
 .  {* Routines for relocs.  *}
 .#define BFD_JUMP_TABLE_RELOCS(NAME) \
 .  NAME##_get_reloc_upper_bound, \
 .  NAME##_canonicalize_reloc, \

+.  NAME##_set_reloc, \

 .  NAME##_bfd_reloc_type_lookup, \
 .  NAME##_bfd_reloc_name_lookup
 .
 .  NAME##_bfd_reloc_type_lookup, \
 .  NAME##_bfd_reloc_name_lookup
 .

-.  long        (*_get_reloc_upper_bound) (bfd *, sec_ptr);
-.  long        (*_bfd_canonicalize_reloc)
-.    (bfd *, sec_ptr, arelent **, struct bfd_symbol **);
+.  long               (*_get_reloc_upper_bound) (bfd *, sec_ptr);
+.  long               (*_bfd_canonicalize_reloc) (bfd *, sec_ptr, arelent **,
+.                                         struct bfd_symbol **);
+.  void               (*_bfd_set_reloc) (bfd *, sec_ptr, arelent **, unsigned int);

 .  {* See documentation on reloc types.  *}
 .  reloc_howto_type *
 .  {* See documentation on reloc types.  *}
 .  reloc_howto_type *

-.              (*reloc_type_lookup) (bfd *, bfd_reloc_code_real_type);
+.             (*reloc_type_lookup) (bfd *, bfd_reloc_code_real_type);

 .  reloc_howto_type *
 .  reloc_howto_type *

-.              (*reloc_name_lookup) (bfd *, const char *);
-.
+.             (*reloc_name_lookup) (bfd *, const char *);

 .
 .  {* Routines used when writing an object file.  *}
 .#define BFD_JUMP_TABLE_WRITE(NAME) \
 .  NAME##_set_arch_mach, \
 .  NAME##_set_section_contents
 .
 .
 .  {* Routines used when writing an object file.  *}
 .#define BFD_JUMP_TABLE_WRITE(NAME) \
 .  NAME##_set_arch_mach, \
 .  NAME##_set_section_contents
 .

-.  bfd_boolean (*_bfd_set_arch_mach)
-.    (bfd *, enum bfd_architecture, unsigned long);
-.  bfd_boolean (*_bfd_set_section_contents)
-.    (bfd *, sec_ptr, const void *, file_ptr, bfd_size_type);
+.  bfd_boolean (*_bfd_set_arch_mach) (bfd *, enum bfd_architecture,
+.                                    unsigned long);
+.  bfd_boolean (*_bfd_set_section_contents) (bfd *, sec_ptr, const void *,
+.                                           file_ptr, bfd_size_type);

 .
 .  {* Routines used by the linker.  *}
 .#define BFD_JUMP_TABLE_LINK(NAME) \
 .
 .  {* Routines used by the linker.  *}
 .#define BFD_JUMP_TABLE_LINK(NAME) \


@@ -446,47 +455,51 @@ BFD_JUMP_TABLE macros.
 .  NAME##_bfd_get_relocated_section_contents, \
 .  NAME##_bfd_relax_section, \
 .  NAME##_bfd_link_hash_table_create, \
 .  NAME##_bfd_get_relocated_section_contents, \
 .  NAME##_bfd_relax_section, \
 .  NAME##_bfd_link_hash_table_create, \

-.  NAME##_bfd_link_hash_table_free, \

 .  NAME##_bfd_link_add_symbols, \
 .  NAME##_bfd_link_just_syms, \
 .  NAME##_bfd_copy_link_hash_symbol_type, \
 .  NAME##_bfd_final_link, \
 .  NAME##_bfd_link_split_section, \
 .  NAME##_bfd_link_add_symbols, \
 .  NAME##_bfd_link_just_syms, \
 .  NAME##_bfd_copy_link_hash_symbol_type, \
 .  NAME##_bfd_final_link, \
 .  NAME##_bfd_link_split_section, \

+.  NAME##_bfd_link_check_relocs, \

 .  NAME##_bfd_gc_sections, \
 .  NAME##_bfd_lookup_section_flags, \
 .  NAME##_bfd_merge_sections, \
 .  NAME##_bfd_is_group_section, \
 .  NAME##_bfd_gc_sections, \
 .  NAME##_bfd_lookup_section_flags, \
 .  NAME##_bfd_merge_sections, \
 .  NAME##_bfd_is_group_section, \

+.  NAME##_bfd_group_name, \

 .  NAME##_bfd_discard_group, \
 .  NAME##_section_already_linked, \
 .  NAME##_bfd_discard_group, \
 .  NAME##_section_already_linked, \

-.  NAME##_bfd_define_common_symbol
+.  NAME##_bfd_define_common_symbol, \
+.  NAME##_bfd_link_hide_symbol, \
+.  NAME##_bfd_define_start_stop

 .
 .

-.  int         (*_bfd_sizeof_headers) (bfd *, struct bfd_link_info *);
-.  bfd_byte *  (*_bfd_get_relocated_section_contents)
-.    (bfd *, struct bfd_link_info *, struct bfd_link_order *,
-.     bfd_byte *, bfd_boolean, struct bfd_symbol **);
+.  int        (*_bfd_sizeof_headers) (bfd *, struct bfd_link_info *);
+.  bfd_byte *  (*_bfd_get_relocated_section_contents) (bfd *,
+.                                                     struct bfd_link_info *,
+.                                                     struct bfd_link_order *,
+.                                                     bfd_byte *, bfd_boolean,
+.                                                     struct bfd_symbol **);

 .
 .

-.  bfd_boolean (*_bfd_relax_section)
-.    (bfd *, struct bfd_section *, struct bfd_link_info *, bfd_boolean *);
+.  bfd_boolean (*_bfd_relax_section) (bfd *, struct bfd_section *,
+.                                    struct bfd_link_info *, bfd_boolean *);

 .
 .  {* Create a hash table for the linker.  Different backends store
 .     different information in this table.  *}
 .  struct bfd_link_hash_table *
 .
 .  {* Create a hash table for the linker.  Different backends store
 .     different information in this table.  *}
 .  struct bfd_link_hash_table *

-.              (*_bfd_link_hash_table_create) (bfd *);
-.
-.  {* Release the memory associated with the linker hash table.  *}
-.  void        (*_bfd_link_hash_table_free) (struct bfd_link_hash_table *);
+.             (*_bfd_link_hash_table_create) (bfd *);

 .
 .  {* Add symbols from this object file into the hash table.  *}
 .  bfd_boolean (*_bfd_link_add_symbols) (bfd *, struct bfd_link_info *);
 .
 .  {* Indicate that we are only retrieving symbol values from this section.  *}
 .
 .  {* Add symbols from this object file into the hash table.  *}
 .  bfd_boolean (*_bfd_link_add_symbols) (bfd *, struct bfd_link_info *);
 .
 .  {* Indicate that we are only retrieving symbol values from this section.  *}

-.  void        (*_bfd_link_just_syms) (asection *, struct bfd_link_info *);
+.  void               (*_bfd_link_just_syms) (asection *, struct bfd_link_info *);

 .
 .

-.  {* Copy the symbol type of a linker hash table entry.  *}
+.  {* Copy the symbol type and other attributes for a linker script
+.     assignment of one symbol to another.  *}

 .#define bfd_copy_link_hash_symbol_type(b, t, f) \
 .#define bfd_copy_link_hash_symbol_type(b, t, f) \

-.  BFD_SEND (b, _bfd_copy_link_hash_symbol_type, (b, t, f))
-.  void (*_bfd_copy_link_hash_symbol_type)
-.    (bfd *, struct bfd_link_hash_entry *, struct bfd_link_hash_entry *);
+.      BFD_SEND (b, _bfd_copy_link_hash_symbol_type, (b, t, f))
+.  void               (*_bfd_copy_link_hash_symbol_type) (bfd *,
+.                                                 struct bfd_link_hash_entry *,
+.                                                 struct bfd_link_hash_entry *);

 .
 .  {* Do a link based on the link_order structures attached to each
 .     section of the BFD.  *}
 .
 .  {* Do a link based on the link_order structures attached to each
 .     section of the BFD.  *}


@@ -495,13 +508,15 @@ BFD_JUMP_TABLE macros.
 .  {* Should this section be split up into smaller pieces during linking.  *}
 .  bfd_boolean (*_bfd_link_split_section) (bfd *, struct bfd_section *);
 .
 .  {* Should this section be split up into smaller pieces during linking.  *}
 .  bfd_boolean (*_bfd_link_split_section) (bfd *, struct bfd_section *);
 .

+.  {* Check the relocations in the bfd for validity.  *}
+.  bfd_boolean (* _bfd_link_check_relocs)(bfd *, struct bfd_link_info *);
+.

 .  {* Remove sections that are not referenced from the output.  *}
 .  bfd_boolean (*_bfd_gc_sections) (bfd *, struct bfd_link_info *);
 .
 .  {* Sets the bitmask of allowed and disallowed section flags.  *}
 .  bfd_boolean (*_bfd_lookup_section_flags) (struct bfd_link_info *,
 .  {* Remove sections that are not referenced from the output.  *}
 .  bfd_boolean (*_bfd_gc_sections) (bfd *, struct bfd_link_info *);
 .
 .  {* Sets the bitmask of allowed and disallowed section flags.  *}
 .  bfd_boolean (*_bfd_lookup_section_flags) (struct bfd_link_info *,

-.                                           struct flag_info *,
-.                                           asection *);
+.                                           struct flag_info *, asection *);

 .
 .  {* Attempt to merge SEC_MERGE sections.  *}
 .  bfd_boolean (*_bfd_merge_sections) (bfd *, struct bfd_link_info *);
 .
 .  {* Attempt to merge SEC_MERGE sections.  *}
 .  bfd_boolean (*_bfd_merge_sections) (bfd *, struct bfd_link_info *);


@@ -509,6 +524,9 @@ BFD_JUMP_TABLE macros.
 .  {* Is this section a member of a group?  *}
 .  bfd_boolean (*_bfd_is_group_section) (bfd *, const struct bfd_section *);
 .
 .  {* Is this section a member of a group?  *}
 .  bfd_boolean (*_bfd_is_group_section) (bfd *, const struct bfd_section *);
 .

+.  {* The group name, if section is a member of a group.  *}
+.  const char *(*_bfd_group_name) (bfd *, const struct bfd_section *);
+.

 .  {* Discard members of a group.  *}
 .  bfd_boolean (*_bfd_discard_group) (bfd *, struct bfd_section *);
 .
 .  {* Discard members of a group.  *}
 .  bfd_boolean (*_bfd_discard_group) (bfd *, struct bfd_section *);
 .


@@ -521,6 +539,15 @@ BFD_JUMP_TABLE macros.
 .  bfd_boolean (*_bfd_define_common_symbol) (bfd *, struct bfd_link_info *,
 .                                           struct bfd_link_hash_entry *);
 .
 .  bfd_boolean (*_bfd_define_common_symbol) (bfd *, struct bfd_link_info *,
 .                                           struct bfd_link_hash_entry *);
 .

+.  {* Hide a symbol.  *}
+.  void (*_bfd_link_hide_symbol) (bfd *, struct bfd_link_info *,
+.                                struct bfd_link_hash_entry *);
+.
+.  {* Define a __start, __stop, .startof. or .sizeof. symbol.  *}
+.  struct bfd_link_hash_entry *
+.             (*_bfd_define_start_stop) (struct bfd_link_info *, const char *,
+.                                        asection *);
+.

 .  {* Routines to handle dynamic symbols and relocs.  *}
 .#define BFD_JUMP_TABLE_DYNAMIC(NAME) \
 .  NAME##_get_dynamic_symtab_upper_bound, \
 .  {* Routines to handle dynamic symbols and relocs.  *}
 .#define BFD_JUMP_TABLE_DYNAMIC(NAME) \
 .  NAME##_get_dynamic_symtab_upper_bound, \


@@ -530,19 +557,18 @@ BFD_JUMP_TABLE macros.
 .  NAME##_canonicalize_dynamic_reloc
 .
 .  {* Get the amount of memory required to hold the dynamic symbols.  *}
 .  NAME##_canonicalize_dynamic_reloc
 .
 .  {* Get the amount of memory required to hold the dynamic symbols.  *}

-.  long        (*_bfd_get_dynamic_symtab_upper_bound) (bfd *);
+.  long               (*_bfd_get_dynamic_symtab_upper_bound) (bfd *);

 .  {* Read in the dynamic symbols.  *}
 .  {* Read in the dynamic symbols.  *}

-.  long        (*_bfd_canonicalize_dynamic_symtab)
-.    (bfd *, struct bfd_symbol **);
+.  long               (*_bfd_canonicalize_dynamic_symtab) (bfd *, struct bfd_symbol **);

 .  {* Create synthetized symbols.  *}
 .  {* Create synthetized symbols.  *}

-.  long        (*_bfd_get_synthetic_symtab)
-.    (bfd *, long, struct bfd_symbol **, long, struct bfd_symbol **,
-.     struct bfd_symbol **);
+.  long               (*_bfd_get_synthetic_symtab) (bfd *, long, struct bfd_symbol **,
+.                                           long, struct bfd_symbol **,
+.                                           struct bfd_symbol **);

 .  {* Get the amount of memory required to hold the dynamic relocs.  *}
 .  {* Get the amount of memory required to hold the dynamic relocs.  *}

-.  long        (*_bfd_get_dynamic_reloc_upper_bound) (bfd *);
+.  long               (*_bfd_get_dynamic_reloc_upper_bound) (bfd *);

 .  {* Read in the dynamic relocs.  *}
 .  {* Read in the dynamic relocs.  *}

-.  long        (*_bfd_canonicalize_dynamic_reloc)
-.    (bfd *, arelent **, struct bfd_symbol **);
+.  long               (*_bfd_canonicalize_dynamic_reloc) (bfd *, arelent **,
+.                                                 struct bfd_symbol **);

 .
 
 A pointer to an alternative bfd_target in case the current one is not
 .
 
 A pointer to an alternative bfd_target in case the current one is not


@@ -552,7 +578,7 @@ endianness.  The function open_output() in ld/ldlang.c uses this field
 to find an alternative output format that is suitable.
 
 .  {* Opposite endian version of this target.  *}
 to find an alternative output format that is suitable.
 
 .  {* Opposite endian version of this target.  *}

-.  const struct bfd_target * alternative_target;
+.  const struct bfd_target *alternative_target;

 .
 
 .  {* Data for use by back-end routines, which isn't
 .
 
 .  {* Data for use by back-end routines, which isn't


@@ -561,368 +587,378 @@ to find an alternative output format that is suitable.
 .
 .} bfd_target;
 .
 .
 .} bfd_target;
 .

+.static inline const char *
+.bfd_get_target (const bfd *abfd)
+.{
+.  return abfd->xvec->name;
+.}
+.
+.static inline enum bfd_flavour
+.bfd_get_flavour (const bfd *abfd)
+.{
+.  return abfd->xvec->flavour;
+.}
+.
+.static inline flagword
+.bfd_applicable_file_flags (const bfd *abfd)
+.{
+.  return abfd->xvec->object_flags;
+.}
+.
+.static inline bfd_boolean
+.bfd_family_coff (const bfd *abfd)
+.{
+.  return (bfd_get_flavour (abfd) == bfd_target_coff_flavour
+.          || bfd_get_flavour (abfd) == bfd_target_xcoff_flavour);
+.}
+.
+.static inline bfd_boolean
+.bfd_big_endian (const bfd *abfd)
+.{
+.  return abfd->xvec->byteorder == BFD_ENDIAN_BIG;
+.}
+.static inline bfd_boolean
+.bfd_little_endian (const bfd *abfd)
+.{
+.  return abfd->xvec->byteorder == BFD_ENDIAN_LITTLE;
+.}
+.
+.static inline bfd_boolean
+.bfd_header_big_endian (const bfd *abfd)
+.{
+.  return abfd->xvec->header_byteorder == BFD_ENDIAN_BIG;
+.}
+.
+.static inline bfd_boolean
+.bfd_header_little_endian (const bfd *abfd)
+.{
+.  return abfd->xvec->header_byteorder == BFD_ENDIAN_LITTLE;
+.}
+.
+.static inline flagword
+.bfd_applicable_section_flags (const bfd *abfd)
+.{
+.  return abfd->xvec->section_flags;
+.}
+.
+.static inline char
+.bfd_get_symbol_leading_char (const bfd *abfd)
+.{
+.  return abfd->xvec->symbol_leading_char;
+.}
+.
+.static inline enum bfd_flavour
+.bfd_asymbol_flavour (const asymbol *sy)
+.{
+.  if ((sy->flags & BSF_SYNTHETIC) != 0)
+.    return bfd_target_unknown_flavour;
+.  return sy->the_bfd->xvec->flavour;
+.}
+.

 */
 
 /* All known xvecs (even those that don't compile on all systems).
    Alphabetized for easy reference.
    They are listed a second time below, since
    we can't intermix extern's and initializers.  */
 */
 
 /* All known xvecs (even those that don't compile on all systems).
    Alphabetized for easy reference.
    They are listed a second time below, since
    we can't intermix extern's and initializers.  */

-extern const bfd_target a_out_adobe_vec;
-extern const bfd_target aix5coff64_vec;
-extern const bfd_target aout0_big_vec;
-extern const bfd_target aout_arm_big_vec;
-extern const bfd_target aout_arm_little_vec;
-extern const bfd_target aout_mips_big_vec;
-extern const bfd_target aout_mips_little_vec;
-extern const bfd_target apollocoff_vec;
-extern const bfd_target arm_epoc_pe_big_vec;
-extern const bfd_target arm_epoc_pe_little_vec;
-extern const bfd_target arm_epoc_pei_big_vec;
-extern const bfd_target arm_epoc_pei_little_vec;
-extern const bfd_target arm_wince_pe_big_vec;
-extern const bfd_target arm_wince_pe_little_vec;
-extern const bfd_target arm_wince_pei_big_vec;
-extern const bfd_target arm_wince_pei_little_vec;
-extern const bfd_target armcoff_big_vec;
-extern const bfd_target armcoff_little_vec;
-extern const bfd_target armnetbsd_vec;
-extern const bfd_target armpe_big_vec;
-extern const bfd_target armpe_little_vec;
-extern const bfd_target armpei_big_vec;
-extern const bfd_target armpei_little_vec;
-extern const bfd_target b_out_vec_big_host;
-extern const bfd_target b_out_vec_little_host;
-extern const bfd_target bfd_pei_ia64_vec;
-extern const bfd_target bfd_elf32_avr_vec;
-extern const bfd_target bfd_elf32_bfin_vec;
-extern const bfd_target bfd_elf32_bfinfdpic_vec;
-extern const bfd_target bfd_elf32_big_generic_vec;
-extern const bfd_target bfd_elf32_bigarc_vec;
-extern const bfd_target bfd_elf32_bigarm_vec;
-extern const bfd_target bfd_elf32_bigarm_nacl_vec;
-extern const bfd_target bfd_elf32_bigarm_symbian_vec;
-extern const bfd_target bfd_elf32_bigarm_vxworks_vec;
-extern const bfd_target bfd_elf32_bigmips_vec;
-extern const bfd_target bfd_elf32_bigmips_vxworks_vec;
-extern const bfd_target bfd_elf32_bigmoxie_vec;
-extern const bfd_target bfd_elf32_bignios2_vec;
-extern const bfd_target bfd_elf32_cr16_vec;
-extern const bfd_target bfd_elf32_cr16c_vec;
-extern const bfd_target bfd_elf32_cris_vec;
-extern const bfd_target bfd_elf32_crx_vec;
-extern const bfd_target bfd_elf32_d10v_vec;
-extern const bfd_target bfd_elf32_d30v_vec;
-extern const bfd_target bfd_elf32_dlx_big_vec;
-extern const bfd_target bfd_elf32_epiphany_vec;
-extern const bfd_target bfd_elf32_fr30_vec;
-extern const bfd_target bfd_elf32_frv_vec;
-extern const bfd_target bfd_elf32_frvfdpic_vec;
-extern const bfd_target bfd_elf32_h8300_vec;
-extern const bfd_target bfd_elf32_hppa_linux_vec;
-extern const bfd_target bfd_elf32_hppa_nbsd_vec;
-extern const bfd_target bfd_elf32_hppa_vec;
-extern const bfd_target bfd_elf32_i370_vec;
-extern const bfd_target bfd_elf32_i386_freebsd_vec;
-extern const bfd_target bfd_elf32_i386_nacl_vec;
-extern const bfd_target bfd_elf32_i386_sol2_vec;
-extern const bfd_target bfd_elf32_i386_vxworks_vec;
-extern const bfd_target bfd_elf32_i386_vec;
-extern const bfd_target bfd_elf32_i860_little_vec;
-extern const bfd_target bfd_elf32_i860_vec;
-extern const bfd_target bfd_elf32_i960_vec;
-extern const bfd_target bfd_elf32_ia64_big_vec;
-extern const bfd_target bfd_elf32_ia64_hpux_big_vec;
-extern const bfd_target bfd_elf32_ip2k_vec;
-extern const bfd_target bfd_elf32_iq2000_vec;
-extern const bfd_target bfd_elf32_lm32_vec;
-extern const bfd_target bfd_elf32_lm32fdpic_vec;
-extern const bfd_target bfd_elf32_little_generic_vec;
-extern const bfd_target bfd_elf32_littlearc_vec;
-extern const bfd_target bfd_elf32_littlearm_vec;
-extern const bfd_target bfd_elf32_littlearm_nacl_vec;
-extern const bfd_target bfd_elf32_littlearm_symbian_vec;
-extern const bfd_target bfd_elf32_littlearm_vxworks_vec;
-extern const bfd_target bfd_elf32_littlemips_vec;
-extern const bfd_target bfd_elf32_littlemips_vxworks_vec;
-extern const bfd_target bfd_elf32_littlemoxie_vec;
-extern const bfd_target bfd_elf32_littlenios2_vec;
-extern const bfd_target bfd_elf32_m32c_vec;
-extern const bfd_target bfd_elf32_m32r_vec;
-extern const bfd_target bfd_elf32_m32rle_vec;
-extern const bfd_target bfd_elf32_m32rlin_vec;
-extern const bfd_target bfd_elf32_m32rlelin_vec;
-extern const bfd_target bfd_elf32_m68hc11_vec;
-extern const bfd_target bfd_elf32_m68hc12_vec;
-extern const bfd_target bfd_elf32_m68k_vec;
-extern const bfd_target bfd_elf32_m88k_vec;
-extern const bfd_target bfd_elf32_mcore_big_vec;
-extern const bfd_target bfd_elf32_mcore_little_vec;
-extern const bfd_target bfd_elf32_mep_vec;
-extern const bfd_target bfd_elf32_mep_little_vec;
-extern const bfd_target bfd_elf32_metag_vec;
-extern const bfd_target bfd_elf32_microblazeel_vec;
-extern const bfd_target bfd_elf32_microblaze_vec;
-extern const bfd_target bfd_elf32_mn10200_vec;
-extern const bfd_target bfd_elf32_mn10300_vec;
-extern const bfd_target bfd_elf32_mt_vec;
-extern const bfd_target bfd_elf32_msp430_vec;
-extern const bfd_target bfd_elf32_msp430_ti_vec;
-extern const bfd_target bfd_elf32_nbigmips_vec;
-extern const bfd_target bfd_elf32_nlittlemips_vec;
-extern const bfd_target bfd_elf32_ntradbigmips_vec;
-extern const bfd_target bfd_elf32_ntradlittlemips_vec;
-extern const bfd_target bfd_elf32_ntradbigmips_freebsd_vec;
-extern const bfd_target bfd_elf32_ntradlittlemips_freebsd_vec;
-extern const bfd_target bfd_elf32_nds32be_vec;
-extern const bfd_target bfd_elf32_nds32le_vec;
-extern const bfd_target bfd_elf32_nds32belin_vec;
-extern const bfd_target bfd_elf32_nds32lelin_vec;
-extern const bfd_target bfd_elf32_openrisc_vec;
-extern const bfd_target bfd_elf32_or32_big_vec;
-extern const bfd_target bfd_elf32_pj_vec;
-extern const bfd_target bfd_elf32_pjl_vec;
-extern const bfd_target bfd_elf32_powerpc_vec;
-extern const bfd_target bfd_elf32_powerpcle_vec;
-extern const bfd_target bfd_elf32_powerpc_freebsd_vec;
-extern const bfd_target bfd_elf32_powerpc_vxworks_vec;
-extern const bfd_target bfd_elf32_rl78_vec;
-extern const bfd_target bfd_elf32_rx_le_vec;
-extern const bfd_target bfd_elf32_rx_be_vec;
-extern const bfd_target bfd_elf32_rx_be_ns_vec;
-extern const bfd_target bfd_elf32_s390_vec;
-extern const bfd_target bfd_elf32_bigscore_vec;
-extern const bfd_target bfd_elf32_littlescore_vec;
-extern const bfd_target bfd_elf32_sh64_vec;
-extern const bfd_target bfd_elf32_sh64l_vec;
-extern const bfd_target bfd_elf32_sh64lin_vec;
-extern const bfd_target bfd_elf32_sh64blin_vec;
-extern const bfd_target bfd_elf32_sh64lnbsd_vec;
-extern const bfd_target bfd_elf32_sh64nbsd_vec;
-extern const bfd_target bfd_elf32_sh_vec;
-extern const bfd_target bfd_elf32_shbfd_vec;
-extern const bfd_target bfd_elf32_shblin_vec;
-extern const bfd_target bfd_elf32_shfd_vec;
-extern const bfd_target bfd_elf32_shl_vec;
-extern const bfd_target bfd_elf32_shl_symbian_vec;
-extern const bfd_target bfd_elf32_shlin_vec;
-extern const bfd_target bfd_elf32_shlnbsd_vec;
-extern const bfd_target bfd_elf32_shlvxworks_vec;
-extern const bfd_target bfd_elf32_shnbsd_vec;
-extern const bfd_target bfd_elf32_shvxworks_vec;
-extern const bfd_target bfd_elf32_sparc_vec;
-extern const bfd_target bfd_elf32_sparc_sol2_vec;
-extern const bfd_target bfd_elf32_sparc_vxworks_vec;
-extern const bfd_target bfd_elf32_spu_vec;
-extern const bfd_target bfd_elf32_tic6x_be_vec;
-extern const bfd_target bfd_elf32_tic6x_le_vec;
-extern const bfd_target bfd_elf32_tic6x_elf_be_vec;
-extern const bfd_target bfd_elf32_tic6x_elf_le_vec;
-extern const bfd_target bfd_elf32_tic6x_linux_be_vec;
-extern const bfd_target bfd_elf32_tic6x_linux_le_vec;
-extern const bfd_target bfd_elf32_tilegx_be_vec;
-extern const bfd_target bfd_elf32_tilegx_le_vec;
-extern const bfd_target bfd_elf32_tilepro_vec;
-extern const bfd_target bfd_elf32_tradbigmips_vec;
-extern const bfd_target bfd_elf32_tradlittlemips_vec;
-extern const bfd_target bfd_elf32_tradbigmips_freebsd_vec;
-extern const bfd_target bfd_elf32_tradlittlemips_freebsd_vec;
-extern const bfd_target bfd_elf32_us_cris_vec;
-extern const bfd_target bfd_elf32_v850_vec;
-extern const bfd_target bfd_elf32_v850_rh850_vec;
-extern const bfd_target bfd_elf32_vax_vec;
-extern const bfd_target bfd_elf32_xc16x_vec;
-extern const bfd_target bfd_elf32_xgate_vec;
-extern const bfd_target bfd_elf32_xstormy16_vec;
-extern const bfd_target bfd_elf32_xtensa_be_vec;
-extern const bfd_target bfd_elf32_xtensa_le_vec;
-extern const bfd_target bfd_elf64_alpha_freebsd_vec;
-extern const bfd_target bfd_elf64_alpha_vec;
-extern const bfd_target bfd_elf64_big_generic_vec;
-extern const bfd_target bfd_elf64_bigmips_vec;
-extern const bfd_target bfd_elf64_bigaarch64_vec;
-extern const bfd_target bfd_elf32_bigaarch64_vec;
-extern const bfd_target bfd_elf64_hppa_linux_vec;
-extern const bfd_target bfd_elf64_hppa_vec;
-extern const bfd_target bfd_elf64_ia64_big_vec;
-extern const bfd_target bfd_elf64_ia64_hpux_big_vec;
-extern const bfd_target bfd_elf64_ia64_little_vec;
-extern const bfd_target bfd_elf64_ia64_vms_vec;
-extern const bfd_target bfd_elf64_little_generic_vec;
-extern const bfd_target bfd_elf64_littlemips_vec;
-extern const bfd_target bfd_elf64_littleaarch64_vec;
-extern const bfd_target bfd_elf32_littleaarch64_vec;
-extern const bfd_target bfd_elf64_mmix_vec;
-extern const bfd_target bfd_elf64_powerpc_vec;
-extern const bfd_target bfd_elf64_powerpcle_vec;
-extern const bfd_target bfd_elf64_powerpc_freebsd_vec;
-extern const bfd_target bfd_elf64_s390_vec;
-extern const bfd_target bfd_elf64_sh64_vec;
-extern const bfd_target bfd_elf64_sh64l_vec;
-extern const bfd_target bfd_elf64_sh64lin_vec;
-extern const bfd_target bfd_elf64_sh64blin_vec;
-extern const bfd_target bfd_elf64_sh64lnbsd_vec;
-extern const bfd_target bfd_elf64_sh64nbsd_vec;
-extern const bfd_target bfd_elf64_sparc_vec;
-extern const bfd_target bfd_elf64_sparc_freebsd_vec;
-extern const bfd_target bfd_elf64_sparc_sol2_vec;
-extern const bfd_target bfd_elf64_tilegx_be_vec;
-extern const bfd_target bfd_elf64_tilegx_le_vec;
-extern const bfd_target bfd_elf64_tradbigmips_vec;
-extern const bfd_target bfd_elf64_tradlittlemips_vec;
-extern const bfd_target bfd_elf64_tradbigmips_freebsd_vec;
-extern const bfd_target bfd_elf64_tradlittlemips_freebsd_vec;
-extern const bfd_target bfd_elf64_x86_64_freebsd_vec;
-extern const bfd_target bfd_elf64_x86_64_nacl_vec;
-extern const bfd_target bfd_elf64_x86_64_sol2_vec;
-extern const bfd_target bfd_elf64_x86_64_vec;
-extern const bfd_target bfd_elf32_x86_64_nacl_vec;
-extern const bfd_target bfd_elf32_x86_64_vec;
-extern const bfd_target bfd_elf64_l1om_freebsd_vec;
-extern const bfd_target bfd_elf64_l1om_vec;
-extern const bfd_target bfd_elf64_k1om_freebsd_vec;
-extern const bfd_target bfd_elf64_k1om_vec;
-extern const bfd_target bfd_mmo_vec;
-extern const bfd_target bfd_powerpc_pe_vec;
-extern const bfd_target bfd_powerpc_pei_vec;
-extern const bfd_target bfd_powerpcle_pe_vec;
-extern const bfd_target bfd_powerpcle_pei_vec;
+extern const bfd_target aarch64_elf32_be_vec;
+extern const bfd_target aarch64_elf32_le_vec;
+extern const bfd_target aarch64_elf64_be_vec;
+extern const bfd_target aarch64_elf64_be_cloudabi_vec;
+extern const bfd_target aarch64_elf64_le_vec;
+extern const bfd_target aarch64_elf64_le_cloudabi_vec;
+extern const bfd_target aarch64_mach_o_vec;
+extern const bfd_target alpha_ecoff_le_vec;
+extern const bfd_target alpha_elf64_vec;
+extern const bfd_target alpha_elf64_fbsd_vec;
+extern const bfd_target alpha_vms_vec;
+extern const bfd_target alpha_vms_lib_txt_vec;
+extern const bfd_target am33_elf32_linux_vec;
+extern const bfd_target aout_vec;
+extern const bfd_target arc_elf32_be_vec;
+extern const bfd_target arc_elf32_le_vec;
+extern const bfd_target arm_elf32_be_vec;
+extern const bfd_target arm_elf32_le_vec;
+extern const bfd_target arm_elf32_fdpic_be_vec;
+extern const bfd_target arm_elf32_fdpic_le_vec;
+extern const bfd_target arm_elf32_nacl_be_vec;
+extern const bfd_target arm_elf32_nacl_le_vec;
+extern const bfd_target arm_elf32_symbian_be_vec;
+extern const bfd_target arm_elf32_symbian_le_vec;
+extern const bfd_target arm_elf32_vxworks_be_vec;
+extern const bfd_target arm_elf32_vxworks_le_vec;
+extern const bfd_target arm_mach_o_vec;
+extern const bfd_target arm_pe_be_vec;
+extern const bfd_target arm_pe_le_vec;
+extern const bfd_target arm_pe_wince_be_vec;
+extern const bfd_target arm_pe_wince_le_vec;
+extern const bfd_target arm_pei_be_vec;
+extern const bfd_target arm_pei_le_vec;
+extern const bfd_target arm_pei_wince_be_vec;
+extern const bfd_target arm_pei_wince_le_vec;
+extern const bfd_target avr_elf32_vec;
+extern const bfd_target bfin_elf32_vec;
+extern const bfd_target bfin_elf32_fdpic_vec;
+extern const bfd_target cr16_elf32_vec;

 extern const bfd_target cris_aout_vec;
 extern const bfd_target cris_aout_vec;

-extern const bfd_target demo_64_vec;
-extern const bfd_target ecoff_big_vec;
-extern const bfd_target ecoff_biglittle_vec;
-extern const bfd_target ecoff_little_vec;
-extern const bfd_target ecoffalpha_little_vec;
-extern const bfd_target go32coff_vec;
-extern const bfd_target go32stubbedcoff_vec;
-extern const bfd_target h8300coff_vec;
-extern const bfd_target h8500coff_vec;
-extern const bfd_target host_aout_vec;
-extern const bfd_target hp300bsd_vec;
-extern const bfd_target hp300hpux_vec;
-extern const bfd_target i386aout_vec;
-extern const bfd_target i386bsd_vec;
-extern const bfd_target i386coff_vec;
-extern const bfd_target i386dynix_vec;
-extern const bfd_target i386freebsd_vec;
-extern const bfd_target i386linux_vec;
-extern const bfd_target i386lynx_aout_vec;
-extern const bfd_target i386lynx_coff_vec;
-extern const bfd_target i386mach3_vec;
-extern const bfd_target i386msdos_vec;
-extern const bfd_target i386netbsd_vec;
-extern const bfd_target i386os9k_vec;
-extern const bfd_target i386pe_vec;
-extern const bfd_target i386pei_vec;
-extern const bfd_target i860coff_vec;
-extern const bfd_target icoff_big_vec;
-extern const bfd_target icoff_little_vec;
-extern const bfd_target ieee_vec;
-extern const bfd_target m68k4knetbsd_vec;
-extern const bfd_target m68kaux_coff_vec;
-extern const bfd_target m68kcoff_vec;
-extern const bfd_target m68kcoffun_vec;
-extern const bfd_target m68klinux_vec;
-extern const bfd_target m68knetbsd_vec;
-extern const bfd_target m68ksysvcoff_vec;
-extern const bfd_target m88kbcs_vec;
-extern const bfd_target m88kmach3_vec;
-extern const bfd_target m88kopenbsd_vec;
+extern const bfd_target cris_elf32_vec;
+extern const bfd_target cris_elf32_us_vec;
+extern const bfd_target crx_elf32_vec;
+extern const bfd_target csky_elf32_be_vec;
+extern const bfd_target csky_elf32_le_vec;
+extern const bfd_target d10v_elf32_vec;
+extern const bfd_target d30v_elf32_vec;
+extern const bfd_target dlx_elf32_be_vec;
+extern const bfd_target elf32_be_vec;
+extern const bfd_target elf32_le_vec;
+extern const bfd_target elf64_be_vec;
+extern const bfd_target elf64_le_vec;
+extern const bfd_target bpf_elf64_le_vec;
+extern const bfd_target bpf_elf64_be_vec;
+extern const bfd_target epiphany_elf32_vec;
+extern const bfd_target fr30_elf32_vec;
+extern const bfd_target frv_elf32_vec;
+extern const bfd_target frv_elf32_fdpic_vec;
+extern const bfd_target h8300_elf32_vec;
+extern const bfd_target h8300_elf32_linux_vec;
+extern const bfd_target hppa_elf32_vec;
+extern const bfd_target hppa_elf32_linux_vec;
+extern const bfd_target hppa_elf32_nbsd_vec;
+extern const bfd_target hppa_elf64_vec;
+extern const bfd_target hppa_elf64_linux_vec;
+extern const bfd_target hppa_som_vec;
+extern const bfd_target i386_aout_vec;
+extern const bfd_target i386_aout_bsd_vec;
+extern const bfd_target i386_aout_lynx_vec;
+extern const bfd_target i386_coff_vec;
+extern const bfd_target i386_coff_go32_vec;
+extern const bfd_target i386_coff_go32stubbed_vec;
+extern const bfd_target i386_coff_lynx_vec;
+extern const bfd_target i386_elf32_vec;
+extern const bfd_target i386_elf32_fbsd_vec;
+extern const bfd_target i386_elf32_nacl_vec;
+extern const bfd_target i386_elf32_sol2_vec;
+extern const bfd_target i386_elf32_vxworks_vec;
+extern const bfd_target i386_mach_o_vec;
+extern const bfd_target i386_msdos_vec;
+extern const bfd_target i386_pe_vec;
+extern const bfd_target i386_pe_big_vec;
+extern const bfd_target i386_pei_vec;
+extern const bfd_target iamcu_elf32_vec;
+extern const bfd_target ia64_elf32_be_vec;
+extern const bfd_target ia64_elf32_hpux_be_vec;
+extern const bfd_target ia64_elf64_be_vec;
+extern const bfd_target ia64_elf64_le_vec;
+extern const bfd_target ia64_elf64_hpux_be_vec;
+extern const bfd_target ia64_elf64_vms_vec;
+extern const bfd_target ia64_pei_vec;
+extern const bfd_target ip2k_elf32_vec;
+extern const bfd_target iq2000_elf32_vec;
+extern const bfd_target k1om_elf64_vec;
+extern const bfd_target k1om_elf64_fbsd_vec;
+extern const bfd_target l1om_elf64_vec;
+extern const bfd_target l1om_elf64_fbsd_vec;
+extern const bfd_target lm32_elf32_vec;
+extern const bfd_target lm32_elf32_fdpic_vec;
+extern const bfd_target m32c_elf32_vec;
+extern const bfd_target m32r_elf32_vec;
+extern const bfd_target m32r_elf32_le_vec;
+extern const bfd_target m32r_elf32_linux_vec;
+extern const bfd_target m32r_elf32_linux_le_vec;
+extern const bfd_target m68hc11_elf32_vec;
+extern const bfd_target m68hc12_elf32_vec;
+extern const bfd_target m68k_elf32_vec;
+extern const bfd_target s12z_elf32_vec;

 extern const bfd_target mach_o_be_vec;
 extern const bfd_target mach_o_le_vec;
 extern const bfd_target mach_o_fat_vec;
 extern const bfd_target mach_o_be_vec;
 extern const bfd_target mach_o_le_vec;
 extern const bfd_target mach_o_fat_vec;

-extern const bfd_target mach_o_i386_vec;
-extern const bfd_target mach_o_x86_64_vec;
-extern const bfd_target mcore_pe_big_vec;
-extern const bfd_target mcore_pe_little_vec;
-extern const bfd_target mcore_pei_big_vec;
-extern const bfd_target mcore_pei_little_vec;
-extern const bfd_target mipslpe_vec;
-extern const bfd_target mipslpei_vec;
-extern const bfd_target newsos3_vec;
-extern const bfd_target nlm32_alpha_vec;
-extern const bfd_target nlm32_i386_vec;
-extern const bfd_target nlm32_powerpc_vec;
-extern const bfd_target nlm32_sparc_vec;
-extern const bfd_target oasys_vec;
-extern const bfd_target or32coff_big_vec;
-extern const bfd_target pc532machaout_vec;
-extern const bfd_target pc532netbsd_vec;
+extern const bfd_target mcore_elf32_be_vec;
+extern const bfd_target mcore_elf32_le_vec;
+extern const bfd_target mcore_pe_be_vec;
+extern const bfd_target mcore_pe_le_vec;
+extern const bfd_target mcore_pei_be_vec;
+extern const bfd_target mcore_pei_le_vec;
+extern const bfd_target mep_elf32_vec;
+extern const bfd_target mep_elf32_le_vec;
+extern const bfd_target metag_elf32_vec;
+extern const bfd_target microblaze_elf32_vec;
+extern const bfd_target microblaze_elf32_le_vec;
+extern const bfd_target mips_ecoff_be_vec;
+extern const bfd_target mips_ecoff_le_vec;
+extern const bfd_target mips_ecoff_bele_vec;
+extern const bfd_target mips_elf32_be_vec;
+extern const bfd_target mips_elf32_le_vec;
+extern const bfd_target mips_elf32_n_be_vec;
+extern const bfd_target mips_elf32_n_le_vec;
+extern const bfd_target mips_elf32_ntrad_be_vec;
+extern const bfd_target mips_elf32_ntrad_le_vec;
+extern const bfd_target mips_elf32_ntradfbsd_be_vec;
+extern const bfd_target mips_elf32_ntradfbsd_le_vec;
+extern const bfd_target mips_elf32_trad_be_vec;
+extern const bfd_target mips_elf32_trad_le_vec;
+extern const bfd_target mips_elf32_tradfbsd_be_vec;
+extern const bfd_target mips_elf32_tradfbsd_le_vec;
+extern const bfd_target mips_elf32_vxworks_be_vec;
+extern const bfd_target mips_elf32_vxworks_le_vec;
+extern const bfd_target mips_elf64_be_vec;
+extern const bfd_target mips_elf64_le_vec;
+extern const bfd_target mips_elf64_trad_be_vec;
+extern const bfd_target mips_elf64_trad_le_vec;
+extern const bfd_target mips_elf64_tradfbsd_be_vec;
+extern const bfd_target mips_elf64_tradfbsd_le_vec;
+extern const bfd_target mmix_elf64_vec;
+extern const bfd_target mmix_mmo_vec;
+extern const bfd_target mn10200_elf32_vec;
+extern const bfd_target mn10300_elf32_vec;
+extern const bfd_target moxie_elf32_be_vec;
+extern const bfd_target moxie_elf32_le_vec;
+extern const bfd_target msp430_elf32_vec;
+extern const bfd_target msp430_elf32_ti_vec;
+extern const bfd_target mt_elf32_vec;
+extern const bfd_target nds32_elf32_be_vec;
+extern const bfd_target nds32_elf32_le_vec;
+extern const bfd_target nds32_elf32_linux_be_vec;
+extern const bfd_target nds32_elf32_linux_le_vec;
+extern const bfd_target nfp_elf64_vec;
+extern const bfd_target nios2_elf32_be_vec;
+extern const bfd_target nios2_elf32_le_vec;
+extern const bfd_target ns32k_aout_pc532mach_vec;
+extern const bfd_target ns32k_aout_pc532nbsd_vec;
+extern const bfd_target or1k_elf32_vec;

 extern const bfd_target pdp11_aout_vec;
 extern const bfd_target pef_vec;
 extern const bfd_target pef_xlib_vec;
 extern const bfd_target pdp11_aout_vec;
 extern const bfd_target pef_vec;
 extern const bfd_target pef_xlib_vec;

+extern const bfd_target pj_elf32_vec;
+extern const bfd_target pj_elf32_le_vec;

 extern const bfd_target plugin_vec;
 extern const bfd_target plugin_vec;

-extern const bfd_target pmac_xcoff_vec;
-extern const bfd_target ppcboot_vec;
-extern const bfd_target riscix_vec;
-extern const bfd_target rs6000coff64_vec;
-extern const bfd_target rs6000coff_vec;
-extern const bfd_target shcoff_small_vec;
-extern const bfd_target shcoff_vec;
-extern const bfd_target shlcoff_small_vec;
-extern const bfd_target shlcoff_vec;
-extern const bfd_target shlpe_vec;
-extern const bfd_target shlpei_vec;
-extern const bfd_target som_vec;
-extern const bfd_target sparccoff_vec;
-extern const bfd_target sparcle_aout_vec;
-extern const bfd_target sparclinux_vec;
-extern const bfd_target sparclynx_aout_vec;
-extern const bfd_target sparclynx_coff_vec;
-extern const bfd_target sparcnetbsd_vec;
-extern const bfd_target sunos_big_vec;
+extern const bfd_target powerpc_boot_vec;
+extern const bfd_target powerpc_elf32_vec;
+extern const bfd_target powerpc_elf32_le_vec;
+extern const bfd_target powerpc_elf32_fbsd_vec;
+extern const bfd_target powerpc_elf32_vxworks_vec;
+extern const bfd_target powerpc_elf64_vec;
+extern const bfd_target powerpc_elf64_le_vec;
+extern const bfd_target powerpc_elf64_fbsd_vec;
+extern const bfd_target powerpc_pe_vec;
+extern const bfd_target powerpc_pe_le_vec;
+extern const bfd_target powerpc_pei_vec;
+extern const bfd_target powerpc_pei_le_vec;
+extern const bfd_target powerpc_xcoff_vec;
+extern const bfd_target pru_elf32_vec;
+extern const bfd_target riscv_elf32_vec;
+extern const bfd_target riscv_elf64_vec;
+extern const bfd_target rl78_elf32_vec;
+extern const bfd_target rs6000_xcoff64_vec;
+extern const bfd_target rs6000_xcoff64_aix_vec;
+extern const bfd_target rs6000_xcoff_vec;
+extern const bfd_target rx_elf32_be_vec;
+extern const bfd_target rx_elf32_be_ns_vec;
+extern const bfd_target rx_elf32_le_vec;
+extern const bfd_target rx_elf32_linux_le_vec;
+extern const bfd_target s390_elf32_vec;
+extern const bfd_target s390_elf64_vec;
+extern const bfd_target score_elf32_be_vec;
+extern const bfd_target score_elf32_le_vec;
+extern const bfd_target sh_coff_vec;
+extern const bfd_target sh_coff_le_vec;
+extern const bfd_target sh_coff_small_vec;
+extern const bfd_target sh_coff_small_le_vec;
+extern const bfd_target sh_elf32_vec;
+extern const bfd_target sh_elf32_le_vec;
+extern const bfd_target sh_elf32_fdpic_be_vec;
+extern const bfd_target sh_elf32_fdpic_le_vec;
+extern const bfd_target sh_elf32_linux_vec;
+extern const bfd_target sh_elf32_linux_be_vec;
+extern const bfd_target sh_elf32_nbsd_vec;
+extern const bfd_target sh_elf32_nbsd_le_vec;
+extern const bfd_target sh_elf32_vxworks_vec;
+extern const bfd_target sh_elf32_vxworks_le_vec;
+extern const bfd_target sh_pe_le_vec;
+extern const bfd_target sh_pei_le_vec;
+extern const bfd_target sparc_elf32_vec;
+extern const bfd_target sparc_elf32_sol2_vec;
+extern const bfd_target sparc_elf32_vxworks_vec;
+extern const bfd_target sparc_elf64_vec;
+extern const bfd_target sparc_elf64_fbsd_vec;
+extern const bfd_target sparc_elf64_sol2_vec;
+extern const bfd_target spu_elf32_vec;

 extern const bfd_target sym_vec;
 extern const bfd_target tic30_aout_vec;
 extern const bfd_target tic30_coff_vec;
 extern const bfd_target sym_vec;
 extern const bfd_target tic30_aout_vec;
 extern const bfd_target tic30_coff_vec;

-extern const bfd_target tic4x_coff0_beh_vec;

 extern const bfd_target tic4x_coff0_vec;
 extern const bfd_target tic4x_coff0_vec;

-extern const bfd_target tic4x_coff1_beh_vec;
+extern const bfd_target tic4x_coff0_beh_vec;

 extern const bfd_target tic4x_coff1_vec;
 extern const bfd_target tic4x_coff1_vec;

-extern const bfd_target tic4x_coff2_beh_vec;
+extern const bfd_target tic4x_coff1_beh_vec;

 extern const bfd_target tic4x_coff2_vec;
 extern const bfd_target tic4x_coff2_vec;

-extern const bfd_target tic54x_coff0_beh_vec;
+extern const bfd_target tic4x_coff2_beh_vec;

 extern const bfd_target tic54x_coff0_vec;
 extern const bfd_target tic54x_coff0_vec;

-extern const bfd_target tic54x_coff1_beh_vec;
+extern const bfd_target tic54x_coff0_beh_vec;

 extern const bfd_target tic54x_coff1_vec;
 extern const bfd_target tic54x_coff1_vec;

-extern const bfd_target tic54x_coff2_beh_vec;
+extern const bfd_target tic54x_coff1_beh_vec;

 extern const bfd_target tic54x_coff2_vec;
 extern const bfd_target tic54x_coff2_vec;

-extern const bfd_target tic80coff_vec;
-extern const bfd_target vaxbsd_vec;
-extern const bfd_target vaxnetbsd_vec;
-extern const bfd_target vax1knetbsd_vec;
-extern const bfd_target versados_vec;
-extern const bfd_target vms_alpha_vec;
-extern const bfd_target vms_lib_txt_vec;
-extern const bfd_target w65_vec;
-extern const bfd_target we32kcoff_vec;
-extern const bfd_target x86_64pe_vec;
-extern const bfd_target x86_64pei_vec;
-extern const bfd_target x86_64pe_bigobj_vec;
-extern const bfd_target x86_64coff_vec;
-extern const bfd_target z80coff_vec;
-extern const bfd_target z8kcoff_vec;
+extern const bfd_target tic54x_coff2_beh_vec;
+extern const bfd_target tic6x_elf32_be_vec;
+extern const bfd_target tic6x_elf32_le_vec;
+extern const bfd_target tic6x_elf32_c6000_be_vec;
+extern const bfd_target tic6x_elf32_c6000_le_vec;
+extern const bfd_target tic6x_elf32_linux_be_vec;
+extern const bfd_target tic6x_elf32_linux_le_vec;
+extern const bfd_target tilegx_elf32_be_vec;
+extern const bfd_target tilegx_elf32_le_vec;
+extern const bfd_target tilegx_elf64_be_vec;
+extern const bfd_target tilegx_elf64_le_vec;
+extern const bfd_target tilepro_elf32_vec;
+extern const bfd_target v800_elf32_vec;
+extern const bfd_target v850_elf32_vec;
+extern const bfd_target ft32_elf32_vec;
+extern const bfd_target vax_aout_1knbsd_vec;
+extern const bfd_target vax_aout_nbsd_vec;
+extern const bfd_target vax_elf32_vec;
+extern const bfd_target visium_elf32_vec;
+extern const bfd_target wasm_vec;
+extern const bfd_target wasm32_elf32_vec;
+extern const bfd_target x86_64_coff_vec;
+extern const bfd_target x86_64_elf32_vec;
+extern const bfd_target x86_64_elf32_nacl_vec;
+extern const bfd_target x86_64_elf64_vec;
+extern const bfd_target x86_64_elf64_cloudabi_vec;
+extern const bfd_target x86_64_elf64_fbsd_vec;
+extern const bfd_target x86_64_elf64_nacl_vec;
+extern const bfd_target x86_64_elf64_sol2_vec;
+extern const bfd_target x86_64_mach_o_vec;
+extern const bfd_target x86_64_pe_vec;
+extern const bfd_target x86_64_pe_big_vec;
+extern const bfd_target x86_64_pei_vec;
+extern const bfd_target xc16x_elf32_vec;
+extern const bfd_target xgate_elf32_vec;
+extern const bfd_target xstormy16_elf32_vec;
+extern const bfd_target xtensa_elf32_be_vec;
+extern const bfd_target xtensa_elf32_le_vec;
+extern const bfd_target z80_coff_vec;
+extern const bfd_target z80_elf32_vec;
+extern const bfd_target z8k_coff_vec;

 
 /* These are always included.  */
 extern const bfd_target srec_vec;
 
 /* These are always included.  */
 extern const bfd_target srec_vec;

-extern const bfd_target verilog_vec;

 extern const bfd_target symbolsrec_vec;
 extern const bfd_target symbolsrec_vec;

+extern const bfd_target verilog_vec;

 extern const bfd_target tekhex_vec;
 extern const bfd_target binary_vec;
 extern const bfd_target ihex_vec;
 
 /* All of the xvecs for core files.  */
 extern const bfd_target tekhex_vec;
 extern const bfd_target binary_vec;
 extern const bfd_target ihex_vec;
 
 /* All of the xvecs for core files.  */

-extern const bfd_target aix386_core_vec;
-extern const bfd_target cisco_core_big_vec;
-extern const bfd_target cisco_core_little_vec;
-extern const bfd_target hppabsd_core_vec;
-extern const bfd_target hpux_core_vec;
-extern const bfd_target irix_core_vec;
-extern const bfd_target netbsd_core_vec;
-extern const bfd_target osf_core_vec;
-extern const bfd_target ptrace_core_vec;
-extern const bfd_target sco5_core_vec;
-extern const bfd_target trad_core_vec;
-
-extern const bfd_target bfd_elf32_am33lin_vec;
+extern const bfd_target core_aix386_vec;
+extern const bfd_target core_cisco_be_vec;
+extern const bfd_target core_cisco_le_vec;
+extern const bfd_target core_hppabsd_vec;
+extern const bfd_target core_hpux_vec;
+extern const bfd_target core_irix_vec;
+extern const bfd_target core_netbsd_vec;
+extern const bfd_target core_osf_vec;
+extern const bfd_target core_ptrace_vec;
+extern const bfd_target core_sco5_vec;
+extern const bfd_target core_trad_vec;
+

 static const bfd_target * const _bfd_target_vector[] =
 {
 #ifdef SELECT_VECS
 static const bfd_target * const _bfd_target_vector[] =
 {
 #ifdef SELECT_VECS


@@ -936,391 +972,335 @@ static const bfd_target * const _bfd_target_vector[] =
 #endif
        /* This list is alphabetized to make it easy to compare
           with other vector lists -- the decls above and
 #endif
        /* This list is alphabetized to make it easy to compare
           with other vector lists -- the decls above and

-          the case statement in configure.in.
+          the case statement in configure.ac.
+          Try to keep it in order when adding new targets, and
+          use a name of the form <cpu>_<format>_<other>_<endian>_vec.
+          Note that sorting is done as if _<endian>_vec wasn't present.

           Vectors that don't compile on all systems, or aren't finished,
           should have an entry here with #if 0 around it, to show that
           it wasn't omitted by mistake.  */
           Vectors that don't compile on all systems, or aren't finished,
           should have an entry here with #if 0 around it, to show that
           it wasn't omitted by mistake.  */

-       &a_out_adobe_vec,

 #ifdef BFD64
 #ifdef BFD64

-       &aix5coff64_vec,
+       &aarch64_elf32_be_vec,
+       &aarch64_elf32_le_vec,
+       &aarch64_elf64_be_vec,
+       &aarch64_elf64_be_cloudabi_vec,
+       &aarch64_elf64_le_vec,
+       &aarch64_elf64_le_cloudabi_vec,
+       &aarch64_mach_o_vec,

 #endif
 #endif

-       &aout0_big_vec,
-#if 0
-       /* We have no way of distinguishing these from other a.out variants.  */
-       &aout_arm_big_vec,
-       &aout_arm_little_vec,
-       /* No one seems to use this.  */
-       &aout_mips_big_vec,
+
+#ifdef BFD64
+       &alpha_ecoff_le_vec,
+       &alpha_elf64_vec,
+       &alpha_elf64_fbsd_vec,
+       &alpha_vms_vec,

 #endif
 #endif

-       &aout_mips_little_vec,
+       &alpha_vms_lib_txt_vec,
+
+       &am33_elf32_linux_vec,
+

 #if 0
 #if 0

-       &apollocoff_vec,
-#endif
-       &arm_epoc_pe_big_vec,
-       &arm_epoc_pe_little_vec,
-       &arm_epoc_pei_big_vec,
-       &arm_epoc_pei_little_vec,
-       &arm_wince_pe_big_vec,
-       &arm_wince_pe_little_vec,
-       &arm_wince_pei_big_vec,
-       &arm_wince_pei_little_vec,
-       &armcoff_big_vec,
-       &armcoff_little_vec,
-       &armnetbsd_vec,
-       &armpe_big_vec,
-       &armpe_little_vec,
-       &armpei_big_vec,
-       &armpei_little_vec,
-       &b_out_vec_big_host,
-       &b_out_vec_little_host,
-#ifdef BFD64
-       &bfd_pei_ia64_vec,
+       /* Since a.out files lack decent magic numbers, no way to recognize
+          which kind of a.out file it is.  */
+       &aout_vec,

 #endif
 #endif

-       &bfd_elf32_avr_vec,
-       &bfd_elf32_bfin_vec,
-       &bfd_elf32_bfinfdpic_vec,
+
+       &arc_elf32_be_vec,
+       &arc_elf32_le_vec,
+
+       &arm_elf32_be_vec,
+       &arm_elf32_le_vec,
+       &arm_elf32_fdpic_be_vec,
+       &arm_elf32_fdpic_le_vec,
+       &arm_elf32_symbian_be_vec,
+       &arm_elf32_symbian_le_vec,
+       &arm_elf32_vxworks_be_vec,
+       &arm_elf32_vxworks_le_vec,
+       &arm_mach_o_vec,
+       &arm_pe_be_vec,
+       &arm_pe_le_vec,
+       &arm_pe_wince_be_vec,
+       &arm_pe_wince_le_vec,
+       &arm_pei_be_vec,
+       &arm_pei_le_vec,
+       &arm_pei_wince_be_vec,
+       &arm_pei_wince_le_vec,
+
+       &avr_elf32_vec,
+
+       &bfin_elf32_vec,
+       &bfin_elf32_fdpic_vec,
+
+       &cr16_elf32_vec,
+
+       &cris_aout_vec,
+       &cris_elf32_vec,
+       &cris_elf32_us_vec,
+
+       &crx_elf32_vec,
+
+       &csky_elf32_be_vec,
+       &csky_elf32_le_vec,
+
+       &d10v_elf32_vec,
+       &d30v_elf32_vec,
+
+       &dlx_elf32_be_vec,

 
        /* This, and other vectors, may not be used in any *.mt configuration.
           But that does not mean they are unnecessary.  If configured with
           --enable-targets=all, objdump or gdb should be able to examine
           the file even if we don't recognize the machine type.  */
 
        /* This, and other vectors, may not be used in any *.mt configuration.
           But that does not mean they are unnecessary.  If configured with
           --enable-targets=all, objdump or gdb should be able to examine
           the file even if we don't recognize the machine type.  */

-       &bfd_elf32_big_generic_vec,
-       &bfd_elf32_bigarc_vec,
-       &bfd_elf32_bigarm_vec,
-       &bfd_elf32_bigarm_symbian_vec,
-       &bfd_elf32_bigarm_vxworks_vec,
-#ifdef BFD64
-       &bfd_elf32_bigmips_vec,
-       &bfd_elf32_bigmips_vxworks_vec,
-#endif
-       &bfd_elf32_bigmoxie_vec,
-       &bfd_elf32_bignios2_vec,
-       &bfd_elf32_cr16_vec,
-       &bfd_elf32_cr16c_vec,
-       &bfd_elf32_cris_vec,
-       &bfd_elf32_crx_vec,
-       &bfd_elf32_d10v_vec,
-       &bfd_elf32_d30v_vec,
-       &bfd_elf32_dlx_big_vec,
-       &bfd_elf32_epiphany_vec,
-       &bfd_elf32_fr30_vec,
-       &bfd_elf32_frv_vec,
-       &bfd_elf32_frvfdpic_vec,
-       &bfd_elf32_h8300_vec,
-       &bfd_elf32_hppa_linux_vec,
-       &bfd_elf32_hppa_nbsd_vec,
-       &bfd_elf32_hppa_vec,
-       &bfd_elf32_i370_vec,
-       &bfd_elf32_i386_freebsd_vec,
-       &bfd_elf32_i386_nacl_vec,
-       &bfd_elf32_i386_sol2_vec,
-       &bfd_elf32_i386_vxworks_vec,
-       &bfd_elf32_i386_vec,
-       &bfd_elf32_i860_little_vec,
-       &bfd_elf32_i860_vec,
-       &bfd_elf32_i960_vec,
-#if 0
-       &bfd_elf32_ia64_big_vec,
-#endif
-#ifdef BFD64
-       &bfd_elf32_ia64_hpux_big_vec,
-#endif
-       &bfd_elf32_ip2k_vec,
-       &bfd_elf32_iq2000_vec,
-       &bfd_elf32_lm32_vec,
-       &bfd_elf32_little_generic_vec,
-       &bfd_elf32_littlearc_vec,
-       &bfd_elf32_littlearm_vec,
-       &bfd_elf32_littlearm_symbian_vec,
-       &bfd_elf32_littlearm_vxworks_vec,
-#ifdef BFD64
-       &bfd_elf32_littlemips_vec,
-       &bfd_elf32_littlemips_vxworks_vec,
-#endif
-       &bfd_elf32_littlemoxie_vec,
-       &bfd_elf32_littlenios2_vec,
-       &bfd_elf32_m32c_vec,
-       &bfd_elf32_m32r_vec,
-        &bfd_elf32_m32rle_vec,
-        &bfd_elf32_m32rlin_vec,
-        &bfd_elf32_m32rlelin_vec,
-       &bfd_elf32_m68hc11_vec,
-       &bfd_elf32_m68hc12_vec,
-       &bfd_elf32_m68k_vec,
-       &bfd_elf32_m88k_vec,
-       &bfd_elf32_mcore_big_vec,
-       &bfd_elf32_mcore_little_vec,
-       &bfd_elf32_mep_vec,
-       &bfd_elf32_metag_vec,
-       &bfd_elf32_microblaze_vec,
-       &bfd_elf32_mn10200_vec,
-       &bfd_elf32_mn10300_vec,
-       &bfd_elf32_mt_vec,
-       &bfd_elf32_msp430_vec,
-       &bfd_elf32_msp430_ti_vec,
-#ifdef BFD64
-       &bfd_elf32_nbigmips_vec,
-       &bfd_elf32_nlittlemips_vec,
-       &bfd_elf32_ntradbigmips_vec,
-       &bfd_elf32_ntradlittlemips_vec,
-       &bfd_elf32_ntradbigmips_freebsd_vec,
-       &bfd_elf32_ntradlittlemips_freebsd_vec,
-#endif
-       &bfd_elf32_nds32be_vec,
-       &bfd_elf32_nds32le_vec,
-       &bfd_elf32_nds32belin_vec,
-       &bfd_elf32_nds32lelin_vec,
-       &bfd_elf32_openrisc_vec,
-       &bfd_elf32_or32_big_vec,
-       &bfd_elf32_pj_vec,
-       &bfd_elf32_pjl_vec,
-       &bfd_elf32_powerpc_vec,
-       &bfd_elf32_powerpc_vxworks_vec,
-       &bfd_elf32_powerpcle_vec,
-       &bfd_elf32_powerpc_freebsd_vec,
-       &bfd_elf32_rl78_vec,
-       &bfd_elf32_rx_be_vec,
-       &bfd_elf32_rx_be_ns_vec,
-       &bfd_elf32_rx_le_vec,
-       &bfd_elf32_s390_vec,
-#ifdef BFD64
-       &bfd_elf32_bigscore_vec,
-       &bfd_elf32_littlescore_vec,
-#endif
-        &bfd_elf32_sh_vec,
-        &bfd_elf32_shbfd_vec,
-        &bfd_elf32_shblin_vec,
-        &bfd_elf32_shfd_vec,
-        &bfd_elf32_shl_vec,
-        &bfd_elf32_shl_symbian_vec,
-        &bfd_elf32_shlin_vec,
-       &bfd_elf32_shlnbsd_vec,
-       &bfd_elf32_shlvxworks_vec,
-       &bfd_elf32_shnbsd_vec,
-       &bfd_elf32_shvxworks_vec,
-#ifdef BFD64
-       &bfd_elf32_sh64_vec,
-       &bfd_elf32_sh64l_vec,
-       &bfd_elf32_sh64lnbsd_vec,
-       &bfd_elf32_sh64nbsd_vec,
-       &bfd_elf32_sh64lin_vec,
-       &bfd_elf32_sh64blin_vec,
-#endif
-       &bfd_elf32_sparc_vec,
-       &bfd_elf32_sparc_sol2_vec,
-       &bfd_elf32_sparc_vxworks_vec,
-       &bfd_elf32_spu_vec,
-       &bfd_elf32_tic6x_be_vec,
-       &bfd_elf32_tic6x_le_vec,
-       &bfd_elf32_tilegx_be_vec,
-       &bfd_elf32_tilegx_le_vec,
-       &bfd_elf32_tilepro_vec,
+       &elf32_be_vec,
+       &elf32_le_vec,

 #ifdef BFD64
 #ifdef BFD64

-       &bfd_elf32_tradbigmips_vec,
-       &bfd_elf32_tradlittlemips_vec,
-       &bfd_elf32_tradbigmips_freebsd_vec,
-       &bfd_elf32_tradlittlemips_freebsd_vec,
+       &elf64_be_vec,
+       &elf64_le_vec,

 #endif
 #endif

-       &bfd_elf32_us_cris_vec,
-       &bfd_elf32_v850_vec,
-       &bfd_elf32_v850_rh850_vec,
-       &bfd_elf32_vax_vec,
-       &bfd_elf32_xc16x_vec,
-       &bfd_elf32_xgate_vec,
-       &bfd_elf32_xstormy16_vec,
-       &bfd_elf32_xtensa_be_vec,
-       &bfd_elf32_xtensa_le_vec,
+
+       &epiphany_elf32_vec,
+
+       &fr30_elf32_vec,
+
+       &frv_elf32_vec,
+       &frv_elf32_fdpic_vec,
+
+       &h8300_elf32_vec,
+       &h8300_elf32_linux_vec,
+
+       &hppa_elf32_vec,
+       &hppa_elf32_linux_vec,
+       &hppa_elf32_nbsd_vec,

 #ifdef BFD64
 #ifdef BFD64

-       &bfd_elf64_alpha_freebsd_vec,
-       &bfd_elf64_alpha_vec,
-       &bfd_elf64_big_generic_vec,
-       &bfd_elf64_bigmips_vec,
-       &bfd_elf64_bigaarch64_vec,
-       &bfd_elf32_bigaarch64_vec,
-       &bfd_elf64_hppa_linux_vec,
-       &bfd_elf64_hppa_vec,
-       &bfd_elf64_ia64_big_vec,
-       &bfd_elf64_ia64_hpux_big_vec,
-       &bfd_elf64_ia64_little_vec,
-       &bfd_elf64_ia64_vms_vec,
-       &bfd_elf64_little_generic_vec,
-       &bfd_elf64_littlemips_vec,
-       &bfd_elf64_littleaarch64_vec,
-       &bfd_elf32_littleaarch64_vec,
-       &bfd_elf64_mmix_vec,
-       &bfd_elf64_powerpc_vec,
-       &bfd_elf64_powerpcle_vec,
-       &bfd_elf64_powerpc_freebsd_vec,
-       &bfd_elf64_s390_vec,
-       &bfd_elf64_sh64_vec,
-       &bfd_elf64_sh64l_vec,
-       &bfd_elf64_sh64lnbsd_vec,
-       &bfd_elf64_sh64nbsd_vec,
-       &bfd_elf64_sh64lin_vec,
-       &bfd_elf64_sh64blin_vec,
-       &bfd_elf64_sparc_vec,
-       &bfd_elf64_sparc_freebsd_vec,
-       &bfd_elf64_sparc_sol2_vec,
-       &bfd_elf64_tilegx_be_vec,
-       &bfd_elf64_tilegx_le_vec,
-       &bfd_elf64_tradbigmips_vec,
-       &bfd_elf64_tradlittlemips_vec,
-       &bfd_elf64_tradbigmips_freebsd_vec,
-       &bfd_elf64_tradlittlemips_freebsd_vec,
-       &bfd_elf64_x86_64_freebsd_vec,
-       &bfd_elf64_x86_64_nacl_vec,
-       &bfd_elf64_x86_64_sol2_vec,
-       &bfd_elf64_x86_64_vec,
-       &bfd_elf32_x86_64_nacl_vec,
-       &bfd_elf32_x86_64_vec,
-       &bfd_elf64_l1om_freebsd_vec,
-       &bfd_elf64_l1om_vec,
-       &bfd_elf64_k1om_freebsd_vec,
-       &bfd_elf64_k1om_vec,
-       &bfd_mmo_vec,
+       &hppa_elf64_vec,
+       &hppa_elf64_linux_vec,

 #endif
 #endif

-       &bfd_powerpc_pe_vec,
-       &bfd_powerpc_pei_vec,
-       &bfd_powerpcle_pe_vec,
-       &bfd_powerpcle_pei_vec,
-       &cris_aout_vec,
+       &hppa_som_vec,
+
+       &i386_aout_vec,
+       &i386_aout_bsd_vec,
+       &i386_aout_lynx_vec,
+       &i386_coff_vec,
+       &i386_coff_go32_vec,
+       &i386_coff_go32stubbed_vec,
+       &i386_coff_lynx_vec,
+       &i386_elf32_vec,
+       &i386_elf32_fbsd_vec,
+       &i386_elf32_nacl_vec,
+       &i386_elf32_sol2_vec,
+       &i386_elf32_vxworks_vec,
+       &i386_mach_o_vec,
+       &i386_msdos_vec,
+       &i386_pe_vec,
+       &i386_pe_big_vec,
+       &i386_pei_vec,
+
+       &iamcu_elf32_vec,
+

 #ifdef BFD64
 #ifdef BFD64

-       &demo_64_vec,   /* Only compiled if host has long-long support.  */
+       &bpf_elf64_be_vec,
+       &bpf_elf64_le_vec,

 #endif
 #endif

-       &ecoff_big_vec,
-       &ecoff_biglittle_vec,
-       &ecoff_little_vec,
+

 #ifdef BFD64
 #ifdef BFD64

-       &ecoffalpha_little_vec,
-#endif
-       &go32coff_vec,
-       &go32stubbedcoff_vec,
-       &h8300coff_vec,
-       &h8500coff_vec,
-#if 0
-       /* Since a.out files lack decent magic numbers, no way to recognize
-          which kind of a.out file it is.  */
-       &host_aout_vec,
-       /* Clashes with sunos_big_vec magic no.  */
-       &hp300bsd_vec,
-#endif
-       &hp300hpux_vec,
-       &i386aout_vec,
-       &i386bsd_vec,
-       &i386coff_vec,
-#if 0
-       &i386dynix_vec,
-#endif
-       &i386freebsd_vec,

 #if 0
 #if 0

-       /* Since a.out files lack decent magic numbers, no way to recognize
-          which kind of a.out file it is.  */
-       &i386linux_vec,
+       &ia64_elf32_be_vec,

 #endif
 #endif

-       &i386lynx_aout_vec,
-       &i386lynx_coff_vec,
-#if 0
-       /* No distinguishing features for Mach 3 executables.  */
-       &i386mach3_vec,
+       &ia64_elf32_hpux_be_vec,
+       &ia64_elf64_be_vec,
+       &ia64_elf64_le_vec,
+       &ia64_elf64_hpux_be_vec,
+       &ia64_elf64_vms_vec,
+       &ia64_pei_vec,

 #endif
 #endif

-       &i386msdos_vec,
-       &i386netbsd_vec,
-       &i386os9k_vec,
-       &i386pe_vec,
-       &i386pei_vec,
+
+       &ip2k_elf32_vec,
+       &iq2000_elf32_vec,
+

 #ifdef BFD64
 #ifdef BFD64

-       &x86_64coff_vec,
-       &x86_64pe_vec,
-       &x86_64pei_vec,
-       &x86_64pe_bigobj_vec,
-#endif
-       &i860coff_vec,
-       &icoff_big_vec,
-       &icoff_little_vec,
-       &ieee_vec,
-#if 0
-       &m68k4knetbsd_vec,
-       &m68kaux_coff_vec,
-#endif
-       &m68kcoff_vec,
-       &m68kcoffun_vec,
-#if 0
-       /* Since a.out files lack decent magic numbers, no way to recognize
-          which kind of a.out file it is.  */
-       &m68klinux_vec,
+       &k1om_elf64_vec,
+       &k1om_elf64_fbsd_vec,
+       &l1om_elf64_vec,
+       &l1om_elf64_fbsd_vec,

 #endif
 #endif

-       &m68knetbsd_vec,
-       &m68ksysvcoff_vec,
-       &m88kbcs_vec,
-       &m88kmach3_vec,
-       &m88kopenbsd_vec,
+
+       &lm32_elf32_vec,
+
+       &m32c_elf32_vec,
+
+       &m32r_elf32_vec,
+       &m32r_elf32_le_vec,
+       &m32r_elf32_linux_vec,
+       &m32r_elf32_linux_le_vec,
+
+       &m68hc11_elf32_vec,
+       &m68hc12_elf32_vec,
+
+       &m68k_elf32_vec,
+
+       &s12z_elf32_vec,
+

        &mach_o_be_vec,
        &mach_o_le_vec,
        &mach_o_fat_vec,
        &mach_o_be_vec,
        &mach_o_le_vec,
        &mach_o_fat_vec,

-       &mach_o_i386_vec,
+
+       &mcore_elf32_be_vec,
+       &mcore_elf32_le_vec,
+       &mcore_pe_be_vec,
+       &mcore_pe_le_vec,
+       &mcore_pei_be_vec,
+       &mcore_pei_le_vec,
+
+       &mep_elf32_vec,
+
+       &metag_elf32_vec,
+
+       &microblaze_elf32_vec,
+
+       &mips_ecoff_be_vec,
+       &mips_ecoff_le_vec,
+       &mips_ecoff_bele_vec,

 #ifdef BFD64
 #ifdef BFD64

-       &mach_o_x86_64_vec,
+       &mips_elf32_be_vec,
+       &mips_elf32_le_vec,
+       &mips_elf32_n_be_vec,
+       &mips_elf32_n_le_vec,
+       &mips_elf32_ntrad_be_vec,
+       &mips_elf32_ntrad_le_vec,
+       &mips_elf32_ntradfbsd_be_vec,
+       &mips_elf32_ntradfbsd_le_vec,
+       &mips_elf32_trad_be_vec,
+       &mips_elf32_trad_le_vec,
+       &mips_elf32_tradfbsd_be_vec,
+       &mips_elf32_tradfbsd_le_vec,
+       &mips_elf32_vxworks_be_vec,
+       &mips_elf32_vxworks_le_vec,
+       &mips_elf64_be_vec,
+       &mips_elf64_le_vec,
+       &mips_elf64_trad_be_vec,
+       &mips_elf64_trad_le_vec,
+       &mips_elf64_tradfbsd_be_vec,
+       &mips_elf64_tradfbsd_le_vec,

 #endif
 #endif

-       &mcore_pe_big_vec,
-       &mcore_pe_little_vec,
-       &mcore_pei_big_vec,
-       &mcore_pei_little_vec,
-       &mipslpe_vec,
-       &mipslpei_vec,
-       &newsos3_vec,
+

 #ifdef BFD64
 #ifdef BFD64

-       &nlm32_alpha_vec,
+       &mmix_elf64_vec,
+       &mmix_mmo_vec,

 #endif
 #endif

-       &nlm32_i386_vec,
-       &nlm32_powerpc_vec,
-       &nlm32_sparc_vec,
-#if 0
-       /* We have no oasys tools anymore, so we can't test any of this
-          anymore. If you want to test the stuff yourself, go ahead...
-          steve@cygnus.com
-          Worse, since there is no magic number for archives, there
-          can be annoying target mis-matches.  */
-       &oasys_vec,
+
+       &mn10200_elf32_vec,
+       &mn10300_elf32_vec,
+
+       &moxie_elf32_be_vec,
+       &moxie_elf32_le_vec,
+
+       &msp430_elf32_vec,
+       &msp430_elf32_ti_vec,
+
+       &mt_elf32_vec,
+
+       &nds32_elf32_be_vec,
+       &nds32_elf32_le_vec,
+       &nds32_elf32_linux_be_vec,
+       &nds32_elf32_linux_le_vec,
+
+#ifdef BFD64
+       &nfp_elf64_vec,

 #endif
 #endif

-       /* Entry for the OpenRISC family.  */
-       &or32coff_big_vec,

 
 

-       &pc532machaout_vec,
-       &pc532netbsd_vec,
+       &nios2_elf32_be_vec,
+       &nios2_elf32_le_vec,
+
+       &ns32k_aout_pc532mach_vec,
+       &ns32k_aout_pc532nbsd_vec,
+
+       &or1k_elf32_vec,
+

        &pdp11_aout_vec,
        &pdp11_aout_vec,

+

        &pef_vec,
        &pef_xlib_vec,
        &pef_vec,
        &pef_xlib_vec,

-#if BFD_SUPPORTS_PLUGINS
-       &plugin_vec,
+
+       &pj_elf32_vec,
+       &pj_elf32_le_vec,
+
+       &powerpc_boot_vec,
+       &powerpc_elf32_vec,
+       &powerpc_elf32_le_vec,
+       &powerpc_elf32_fbsd_vec,
+       &powerpc_elf32_vxworks_vec,
+#ifdef BFD64
+       &powerpc_elf64_vec,
+       &powerpc_elf64_le_vec,
+       &powerpc_elf64_fbsd_vec,

 #endif
 #endif

+       &powerpc_pe_vec,
+       &powerpc_pe_le_vec,
+       &powerpc_pei_vec,
+       &powerpc_pei_le_vec,

 #if 0
        /* This has the same magic number as RS/6000.  */
 #if 0
        /* This has the same magic number as RS/6000.  */

-       &pmac_xcoff_vec,
+       &powerpc_xcoff_vec,

 #endif
 #endif

-       &ppcboot_vec,
-#if 0
-       /* We have no way of distinguishing these from other a.out variants.  */
-       &riscix_vec,
+
+       &pru_elf32_vec,
+
+#ifdef BFD64
+       &riscv_elf32_vec,
+       &riscv_elf64_vec,
+#endif
+       &rl78_elf32_vec,
+
+#ifdef BFD64
+       &rs6000_xcoff64_vec,
+       &rs6000_xcoff64_aix_vec,
+#endif
+       &rs6000_xcoff_vec,
+
+       &rx_elf32_be_vec,
+       &rx_elf32_be_ns_vec,
+       &rx_elf32_le_vec,
+
+       &s390_elf32_vec,
+#ifdef BFD64
+       &s390_elf64_vec,

 #endif
 #endif

+
+#ifdef BFD64
+       &score_elf32_be_vec,
+       &score_elf32_le_vec,
+#endif
+
+       &sh_coff_vec,
+       &sh_coff_le_vec,
+       &sh_coff_small_vec,
+       &sh_coff_small_le_vec,
+       &sh_elf32_vec,
+       &sh_elf32_le_vec,
+       &sh_elf32_fdpic_be_vec,
+       &sh_elf32_fdpic_le_vec,
+       &sh_elf32_linux_vec,
+       &sh_elf32_linux_be_vec,
+       &sh_elf32_nbsd_vec,
+       &sh_elf32_nbsd_le_vec,
+       &sh_elf32_vxworks_vec,
+       &sh_elf32_vxworks_le_vec,
+       &sh_pe_le_vec,
+       &sh_pei_le_vec,
+
+       &sparc_elf32_vec,
+       &sparc_elf32_sol2_vec,
+       &sparc_elf32_vxworks_vec,

 #ifdef BFD64
 #ifdef BFD64

-       &rs6000coff64_vec,
+       &sparc_elf64_vec,
+       &sparc_elf64_fbsd_vec,
+       &sparc_elf64_sol2_vec,

 #endif
 #endif

-       &rs6000coff_vec,
-       &shcoff_small_vec,
-       &shcoff_vec,
-       &shlcoff_small_vec,
-       &shlcoff_vec,
-       &shlpe_vec,
-       &shlpei_vec,
-       &som_vec,
-       &sparccoff_vec,
-       &sparcle_aout_vec,
-       &sparclinux_vec,
-       &sparclynx_aout_vec,
-       &sparclynx_coff_vec,
-       &sparcnetbsd_vec,
-       &sunos_big_vec,
+
+       &spu_elf32_vec,
+

        &sym_vec,
        &sym_vec,

+

        &tic30_aout_vec,
        &tic30_coff_vec,
        &tic54x_coff0_beh_vec,
        &tic30_aout_vec,
        &tic30_coff_vec,
        &tic54x_coff0_beh_vec,


@@ -1329,20 +1309,59 @@ static const bfd_target * const _bfd_target_vector[] =
        &tic54x_coff1_vec,
        &tic54x_coff2_beh_vec,
        &tic54x_coff2_vec,
        &tic54x_coff1_vec,
        &tic54x_coff2_beh_vec,
        &tic54x_coff2_vec,

-       &tic80coff_vec,
-       &vaxbsd_vec,
-       &vaxnetbsd_vec,
-       &vax1knetbsd_vec,
-       &versados_vec,
+       &tic6x_elf32_be_vec,
+       &tic6x_elf32_le_vec,
+
+       &tilegx_elf32_be_vec,
+       &tilegx_elf32_le_vec,
+#ifdef BFD64
+       &tilegx_elf64_be_vec,
+       &tilegx_elf64_le_vec,
+#endif
+       &tilepro_elf32_vec,
+
+       &ft32_elf32_vec,
+
+       &v800_elf32_vec,
+       &v850_elf32_vec,
+
+       &vax_aout_1knbsd_vec,
+       &vax_aout_nbsd_vec,
+       &vax_elf32_vec,
+
+       &visium_elf32_vec,
+
+       &wasm_vec,
+       &wasm32_elf32_vec,
+

 #ifdef BFD64
 #ifdef BFD64

-       &vms_alpha_vec,
+       &x86_64_coff_vec,
+       &x86_64_elf32_vec,
+       &x86_64_elf32_nacl_vec,
+       &x86_64_elf64_vec,
+       &x86_64_elf64_cloudabi_vec,
+       &x86_64_elf64_fbsd_vec,
+       &x86_64_elf64_nacl_vec,
+       &x86_64_elf64_sol2_vec,
+       &x86_64_mach_o_vec,
+       &x86_64_pe_vec,
+       &x86_64_pe_big_vec,
+       &x86_64_pei_vec,

 #endif
 #endif

-        &vms_lib_txt_vec,
-       &w65_vec,
-       &we32kcoff_vec,
-       &z80coff_vec,
-       &z8kcoff_vec,
-       &bfd_elf32_am33lin_vec,
+
+       &xc16x_elf32_vec,
+
+       &xgate_elf32_vec,
+
+       &xstormy16_elf32_vec,
+
+       &xtensa_elf32_be_vec,
+       &xtensa_elf32_le_vec,
+
+       &z80_coff_vec,
+       &z80_elf32_vec,
+
+       &z8k_coff_vec,

 #endif /* not SELECT_VECS */
 
 /* Always support S-records, for convenience.  */
 #endif /* not SELECT_VECS */
 
 /* Always support S-records, for convenience.  */


@@ -1357,41 +1376,45 @@ static const bfd_target * const _bfd_target_vector[] =
 /* Likewise for ihex.  */
        &ihex_vec,
 
 /* Likewise for ihex.  */
        &ihex_vec,
 

+#if BFD_SUPPORTS_PLUGINS
+       &plugin_vec,
+#endif
+

 /* Add any required traditional-core-file-handler.  */
 
 #ifdef AIX386_CORE
 /* Add any required traditional-core-file-handler.  */
 
 #ifdef AIX386_CORE

-       &aix386_core_vec,
+       &core_aix386_vec,

 #endif
 #if 0
        /* 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
           might spuriously match other kinds of files.  */
 #endif
 #if 0
        /* 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
           might spuriously match other kinds of files.  */

-       &cisco_core_big_vec,
-       &cisco_core_little_vec,
+       &core_cisco_be_vec,
+       &core_cisco_le_vec,

 #endif
 #ifdef HPPABSD_CORE
 #endif
 #ifdef HPPABSD_CORE

-       &hppabsd_core_vec,
+       &core_hppabsd_vec,

 #endif
 #ifdef HPUX_CORE
 #endif
 #ifdef HPUX_CORE

-       &hpux_core_vec,
+       &core_hpux_vec,

 #endif
 #ifdef IRIX_CORE
 #endif
 #ifdef IRIX_CORE

-       &irix_core_vec,
+       &core_irix_vec,

 #endif
 #ifdef NETBSD_CORE
 #endif
 #ifdef NETBSD_CORE

-       &netbsd_core_vec,
+       &core_netbsd_vec,

 #endif
 #ifdef OSF_CORE
 #endif
 #ifdef OSF_CORE

-       &osf_core_vec,
+       &core_osf_vec,

 #endif
 #ifdef PTRACE_CORE
 #endif
 #ifdef PTRACE_CORE

-       &ptrace_core_vec,
+       &core_ptrace_vec,

 #endif
 #ifdef SCO5_CORE
 #endif
 #ifdef SCO5_CORE

-       &sco5_core_vec,
+       &core_sco5_vec,

 #endif
 #ifdef TRAD_CORE
 #endif
 #ifdef TRAD_CORE

-       &trad_core_vec,
+       &core_trad_vec,

 #endif
 
        NULL /* end of list marker */
 #endif
 
        NULL /* end of list marker */


@@ -1575,11 +1598,11 @@ _bfd_find_arch_match (const char *tname, const char **arch,
       char end_ch = (in_a ? in_a[strlen (tname)] : 0);
 
       if (in_a && (in_a == *arch || in_a[-1] == ':')
       char end_ch = (in_a ? in_a[strlen (tname)] : 0);
 
       if (in_a && (in_a == *arch || in_a[-1] == ':')

-          && end_ch == 0)
-        {
-          *def_target_arch = *arch;
-          return TRUE;
-        }
+         && end_ch == 0)
+       {
+         *def_target_arch = *arch;
+         return TRUE;
+       }

       arch++;
     }
   return FALSE;
       arch++;
     }
   return FALSE;


@@ -1591,20 +1614,20 @@ FUNCTION
 SYNOPSIS
        const bfd_target *bfd_get_target_info (const char *target_name,
                                               bfd *abfd,
 SYNOPSIS
        const bfd_target *bfd_get_target_info (const char *target_name,
                                               bfd *abfd,

-                                              bfd_boolean *is_bigendian,
+                                              bfd_boolean *is_bigendian,

                                               int *underscoring,
                                               const char **def_target_arch);
 DESCRIPTION
                                               int *underscoring,
                                               const char **def_target_arch);
 DESCRIPTION

-        Return a pointer to the transfer vector for the object target
-        named @var{target_name}.  If @var{target_name} is <<NULL>>,
-        choose the one in the environment variable <<GNUTARGET>>; if
-        that is null or not defined, then choose the first entry in the
-        target list.  Passing in the string "default" or setting the
-        environment variable to "default" will cause the first entry in
-        the target list to be returned, and "target_defaulted" will be
-        set in the BFD if @var{abfd} isn't <<NULL>>.  This causes
-        <<bfd_check_format>> to loop over all the targets to find the
-        one that matches the file being read.
+       Return a pointer to the transfer vector for the object target
+       named @var{target_name}.  If @var{target_name} is <<NULL>>,
+       choose the one in the environment variable <<GNUTARGET>>; if
+       that is null or not defined, then choose the first entry in the
+       target list.  Passing in the string "default" or setting the
+       environment variable to "default" will cause the first entry in
+       the target list to be returned, and "target_defaulted" will be
+       set in the BFD if @var{abfd} isn't <<NULL>>.  This causes
+       <<bfd_check_format>> to loop over all the targets to find the
+       one that matches the file being read.

        If @var{is_bigendian} is not <<NULL>>, then set this value to target's
        endian mode. True for big-endian, FALSE for little-endian or for
        invalid target.
        If @var{is_bigendian} is not <<NULL>>, then set this value to target's
        endian mode. True for big-endian, FALSE for little-endian or for
        invalid target.


@@ -1642,12 +1665,12 @@ bfd_get_target_info (const char *target_name, bfd *abfd,
       const char **arches = bfd_arch_list ();
 
       if (arches && tname)
       const char **arches = bfd_arch_list ();
 
       if (arches && tname)

-        {
-          char *hyp = strchr (tname, '-');
+       {
+         char *hyp = strchr (tname, '-');

 
 

-          if (hyp != NULL)
-            {
-              tname = ++hyp;
+         if (hyp != NULL)
+           {
+             tname = ++hyp;

 
              /* Make sure we detect architecture names
                 for triplets like "pe-arm-wince-little".  */
 
              /* Make sure we detect architecture names
                 for triplets like "pe-arm-wince-little".  */


@@ -1660,7 +1683,7 @@ bfd_get_target_info (const char *target_name, bfd *abfd,
                    {
                      *hyp = 0;
                      if (_bfd_find_arch_match (new_tname, arches,
                    {
                      *hyp = 0;
                      if (_bfd_find_arch_match (new_tname, arches,

-                                               def_target_arch))
+                                               def_target_arch))

                        break;
                    }
                }
                        break;
                    }
                }


@@ -1669,8 +1692,7 @@ bfd_get_target_info (const char *target_name, bfd *abfd,
            _bfd_find_arch_match (tname, arches, def_target_arch);
        }
 
            _bfd_find_arch_match (tname, arches, def_target_arch);
        }
 

-      if (arches)
-        free (arches);
+      free (arches);

     }
   return target_vec;
 }
     }
   return target_vec;
 }


@@ -1693,7 +1715,7 @@ const char **
 bfd_target_list (void)
 {
   int vec_length = 0;
 bfd_target_list (void)
 {
   int vec_length = 0;

-  bfd_size_type amt;
+  size_t amt;

   const bfd_target * const *target;
   const  char **name_list, **name_ptr;
 
   const bfd_target * const *target;
   const  char **name_list, **name_ptr;
 


@@ -1717,30 +1739,73 @@ bfd_target_list (void)
 
 /*
 FUNCTION
 
 /*
 FUNCTION

-       bfd_seach_for_target
+       bfd_iterate_over_targets

 
 SYNOPSIS
 
 SYNOPSIS

-       const bfd_target *bfd_search_for_target
-         (int (*search_func) (const bfd_target *, void *),
-          void *);
+       const bfd_target *bfd_iterate_over_targets
+         (int (*func) (const bfd_target *, void *),
+          void *data);

 
 DESCRIPTION
 
 DESCRIPTION

-       Return a pointer to the first transfer vector in the list of
-       transfer vectors maintained by BFD that produces a non-zero
-       result when passed to the function @var{search_func}.  The
-       parameter @var{data} is passed, unexamined, to the search
-       function.
+       Call @var{func} for each target in the list of BFD target
+       vectors, passing @var{data} to @var{func}.  Stop iterating if
+       @var{func} returns a non-zero result, and return that target
+       vector.  Return NULL if @var{func} always returns zero.

 */
 
 const bfd_target *
 */
 
 const bfd_target *

-bfd_search_for_target (int (*search_func) (const bfd_target *, void *),
-                      void *data)
+bfd_iterate_over_targets (int (*func) (const bfd_target *, void *),
+                         void *data)

 {
 {

-  const bfd_target * const *target;
+  const bfd_target *const *target;

 
 

-  for (target = bfd_target_vector; *target != NULL; target ++)
-    if (search_func (*target, data))
+  for (target = bfd_target_vector; *target != NULL; ++target)
+    if (func (*target, data))

       return *target;
 
   return NULL;
 }
       return *target;
 
   return NULL;
 }

+
+/*
+FUNCTION
+       bfd_flavour_name
+
+SYNOPSIS
+       const char *bfd_flavour_name (enum bfd_flavour flavour);
+
+DESCRIPTION
+       Return the string form of @var{flavour}.
+*/
+
+const char *
+bfd_flavour_name (enum bfd_flavour flavour)
+{
+  switch (flavour)
+    {
+    case bfd_target_unknown_flavour: return "unknown file format";
+    case bfd_target_aout_flavour: return "a.out";
+    case bfd_target_coff_flavour: return "COFF";
+    case bfd_target_ecoff_flavour: return "ECOFF";
+    case bfd_target_xcoff_flavour: return "XCOFF";
+    case bfd_target_elf_flavour: return "ELF";
+    case bfd_target_tekhex_flavour: return "Tekhex";
+    case bfd_target_srec_flavour: return "Srec";
+    case bfd_target_verilog_flavour: return "Verilog";
+    case bfd_target_ihex_flavour: return "Ihex";
+    case bfd_target_som_flavour: return "SOM";
+    case bfd_target_os9k_flavour: return "OS9K";
+    case bfd_target_versados_flavour: return "Versados";
+    case bfd_target_msdos_flavour: return "MSDOS";
+    case bfd_target_ovax_flavour: return "Ovax";
+    case bfd_target_evax_flavour: return "Evax";
+    case bfd_target_mmo_flavour: return "mmo";
+    case bfd_target_mach_o_flavour: return "MACH_O";
+    case bfd_target_pef_flavour: return "PEF";
+    case bfd_target_pef_xlib_flavour: return "PEF_XLIB";
+    case bfd_target_sym_flavour: return "SYM";
+    /* There is no "default" case here so that -Wswitch (part of -Wall)
+       catches missing entries.  */
+    }
+
+  abort ();
+}