1999-12-30 Andrew Haley <aph@cygnus.com>

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

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

-   Copyright 1990, 91, 92, 93, 94 Free Software Foundation, Inc.
+   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 98, 1999
+   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.


@@ -16,11 +17,12 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 
 #include "bfd.h"
 #include "sysdep.h"
 #include "libbfd.h"
 
 #include "bfd.h"
 #include "sysdep.h"
 #include "libbfd.h"

+#include "fnmatch.h"

 
 /*
 SECTION 
 
 /*
 SECTION 


@@ -102,11 +104,27 @@ DESCRIPTION
 
 .#define BFD_SEND(bfd, message, arglist) \
 .               ((*((bfd)->xvec->message)) arglist)
 
 .#define BFD_SEND(bfd, message, arglist) \
 .               ((*((bfd)->xvec->message)) arglist)

+.
+.#ifdef DEBUG_BFD_SEND
+.#undef BFD_SEND
+.#define BFD_SEND(bfd, message, arglist) \
+.  (((bfd) && (bfd)->xvec && (bfd)->xvec->message) ? \
+.    ((*((bfd)->xvec->message)) arglist) : \
+.    (bfd_assert (__FILE__,__LINE__), NULL))
+.#endif

 
        For operations which index on the BFD format:
 
 .#define BFD_SEND_FMT(bfd, message, arglist) \
 .            (((bfd)->xvec->message[(int)((bfd)->format)]) arglist)
 
        For operations which index on the BFD format:
 
 .#define BFD_SEND_FMT(bfd, message, arglist) \
 .            (((bfd)->xvec->message[(int)((bfd)->format)]) arglist)

+.
+.#ifdef DEBUG_BFD_SEND
+.#undef BFD_SEND_FMT
+.#define BFD_SEND_FMT(bfd, message, arglist) \
+.  (((bfd) && (bfd)->xvec && (bfd)->xvec->message) ? \
+.   (((bfd)->xvec->message[(int)((bfd)->format)]) arglist) : \
+.   (bfd_assert (__FILE__,__LINE__), NULL))
+.#endif

 
        This is the structure which defines the type of BFD this is.  The
        <<xvec>> member of the struct <<bfd>> itself points here.  Each
 
        This is the structure which defines the type of BFD this is.  The
        <<xvec>> member of the struct <<bfd>> itself points here.  Each


@@ -129,7 +147,16 @@ DESCRIPTION
 .  bfd_target_oasys_flavour,
 .  bfd_target_tekhex_flavour,
 .  bfd_target_srec_flavour,
 .  bfd_target_oasys_flavour,
 .  bfd_target_tekhex_flavour,
 .  bfd_target_srec_flavour,

-.  bfd_target_som_flavour};
+.  bfd_target_ihex_flavour,
+.  bfd_target_som_flavour,
+.  bfd_target_os9k_flavour,
+.  bfd_target_versados_flavour,
+.  bfd_target_msdos_flavour,
+.  bfd_target_ovax_flavour,
+.  bfd_target_evax_flavour
+.};
+.
+.enum bfd_endian { BFD_ENDIAN_BIG, BFD_ENDIAN_LITTLE, BFD_ENDIAN_UNKNOWN };

 .
 .{* Forward declaration.  *}
 .typedef struct bfd_link_info _bfd_link_info;
 .
 .{* Forward declaration.  *}
 .typedef struct bfd_link_info _bfd_link_info;


@@ -148,14 +175,14 @@ of a file.
 
 The order of bytes within the data area of a file.
 
 
 The order of bytes within the data area of a file.
 

-.  boolean byteorder_big_p;
+.  enum bfd_endian byteorder;

 
 The order of bytes within the header parts of a file.
 
 
 The order of bytes within the header parts of a file.
 

-.  boolean header_byteorder_big_p;
+.  enum bfd_endian header_byteorder;

 
 A mask of all the flags which an executable may have set -
 
 A mask of all the flags which an executable may have set -

-from the set <<NO_FLAGS>>, <<HAS_RELOC>>, ...<<D_PAGED>>.
+from the set <<BFD_NO_FLAGS>>, <<HAS_RELOC>>, ...<<D_PAGED>>.

 
 .  flagword object_flags;       
 
 
 .  flagword object_flags;       
 


@@ -177,10 +204,6 @@ The maximum number of characters in an archive header.
 
 .  unsigned short ar_max_namelen;
 
 
 .  unsigned short ar_max_namelen;
 

-The minimum alignment restriction for any section.
-
-.  unsigned int align_power_min;
-

 Entries for byte swapping for data. These are different from the other
 entry points, since they don't take a BFD asthe 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 asthe first argument.
 Certain other handlers could do the same.


@@ -212,7 +235,7 @@ 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. 
 
 
 Check the format of a file being read.  Return a <<bfd_target *>> or zero. 
 

-.  struct bfd_target * (*_bfd_check_format[bfd_type_end]) PARAMS ((bfd *));
+.  const struct bfd_target *(*_bfd_check_format[bfd_type_end]) PARAMS ((bfd *));

 
 Set the format of a file being written.  
 
 
 Set the format of a file being written.  
 


@@ -222,45 +245,113 @@ Write cached information into a file being written, at <<bfd_close>>.
 
 .  boolean             (*_bfd_write_contents[bfd_type_end]) PARAMS ((bfd *));
 
 
 .  boolean             (*_bfd_write_contents[bfd_type_end]) PARAMS ((bfd *));
 

-The following functions are defined in <<JUMP_TABLE>>. The idea is
-that the back end writer of <<foo>> names all the routines
-<<foo_>>@var{entry_point}; <<JUMP_TABLE>> will build the entries
-in this structure in the right order.
-
-Core file entry points.
+The general target vector.  These vectors are initialized using the
+BFD_JUMP_TABLE macros.

 
 

+.
+.  {* Generic entry points.  *}
+.#define BFD_JUMP_TABLE_GENERIC(NAME)\
+.CAT(NAME,_close_and_cleanup),\
+.CAT(NAME,_bfd_free_cached_info),\
+.CAT(NAME,_new_section_hook),\
+.CAT(NAME,_get_section_contents),\
+.CAT(NAME,_get_section_contents_in_window)
+.
+.  {* Called when the BFD is being closed to do any necessary cleanup.  *}
+.  boolean       (*_close_and_cleanup) PARAMS ((bfd *));
+.  {* Ask the BFD to free all cached information.  *}
+.  boolean (*_bfd_free_cached_info) PARAMS ((bfd *));
+.  {* Called when a new section is created.  *}
+.  boolean       (*_new_section_hook) PARAMS ((bfd *, sec_ptr));
+.  {* Read the contents of a section.  *}
+.  boolean       (*_bfd_get_section_contents) PARAMS ((bfd *, sec_ptr, PTR, 
+.                                            file_ptr, bfd_size_type));
+.  boolean       (*_bfd_get_section_contents_in_window)
+.                          PARAMS ((bfd *, sec_ptr, bfd_window *,
+.                                   file_ptr, bfd_size_type));
+.
+.  {* Entry points to copy private data.  *}
+.#define BFD_JUMP_TABLE_COPY(NAME)\
+.CAT(NAME,_bfd_copy_private_bfd_data),\
+.CAT(NAME,_bfd_merge_private_bfd_data),\
+.CAT(NAME,_bfd_copy_private_section_data),\
+.CAT(NAME,_bfd_copy_private_symbol_data),\
+.CAT(NAME,_bfd_set_private_flags),\
+.CAT(NAME,_bfd_print_private_bfd_data)\
+.  {* Called to copy BFD general private data from one object file
+.     to another.  *}
+.  boolean      (*_bfd_copy_private_bfd_data) PARAMS ((bfd *, bfd *));
+.  {* Called to merge BFD general private data from one object file
+.     to a common output file when linking.  *}
+.  boolean      (*_bfd_merge_private_bfd_data) PARAMS ((bfd *, bfd *));
+.  {* Called to copy BFD private section data from one object file
+.     to another.  *}
+.  boolean       (*_bfd_copy_private_section_data) PARAMS ((bfd *, sec_ptr,
+.                                                       bfd *, sec_ptr));
+.  {* Called to copy BFD private symbol data from one symbol 
+.     to another.  *}
+.  boolean       (*_bfd_copy_private_symbol_data) PARAMS ((bfd *, asymbol *,
+.                                                         bfd *, asymbol *));
+.  {* Called to set private backend flags *}
+.  boolean      (*_bfd_set_private_flags) PARAMS ((bfd *, flagword));
+.
+.  {* Called to print private BFD data *}
+.  boolean       (*_bfd_print_private_bfd_data) PARAMS ((bfd *, PTR));
+.
+.  {* Core file entry points.  *}
+.#define BFD_JUMP_TABLE_CORE(NAME)\
+.CAT(NAME,_core_file_failing_command),\
+.CAT(NAME,_core_file_failing_signal),\
+.CAT(NAME,_core_file_matches_executable_p)

 .  char *   (*_core_file_failing_command) PARAMS ((bfd *));
 .  int      (*_core_file_failing_signal) PARAMS ((bfd *));
 .  boolean  (*_core_file_matches_executable_p) PARAMS ((bfd *, bfd *));
 .  char *   (*_core_file_failing_command) PARAMS ((bfd *));
 .  int      (*_core_file_failing_signal) PARAMS ((bfd *));
 .  boolean  (*_core_file_matches_executable_p) PARAMS ((bfd *, bfd *));

-
-Archive entry points.
-
+.
+.  {* Archive entry points.  *}
+.#define BFD_JUMP_TABLE_ARCHIVE(NAME)\
+.CAT(NAME,_slurp_armap),\
+.CAT(NAME,_slurp_extended_name_table),\
+.CAT(NAME,_construct_extended_name_table),\
+.CAT(NAME,_truncate_arname),\
+.CAT(NAME,_write_armap),\
+.CAT(NAME,_read_ar_hdr),\
+.CAT(NAME,_openr_next_archived_file),\
+.CAT(NAME,_get_elt_at_index),\
+.CAT(NAME,_generic_stat_arch_elt),\
+.CAT(NAME,_update_armap_timestamp)

 .  boolean  (*_bfd_slurp_armap) PARAMS ((bfd *));
 .  boolean  (*_bfd_slurp_extended_name_table) PARAMS ((bfd *));
 .  boolean  (*_bfd_slurp_armap) PARAMS ((bfd *));
 .  boolean  (*_bfd_slurp_extended_name_table) PARAMS ((bfd *));

+.  boolean  (*_bfd_construct_extended_name_table)
+.             PARAMS ((bfd *, char **, bfd_size_type *, const char **));

 .  void     (*_bfd_truncate_arname) PARAMS ((bfd *, CONST char *, char *));
 .  boolean  (*write_armap) PARAMS ((bfd *arch, 
 .                              unsigned int elength,
 .                              struct orl *map,
 .                              unsigned int orl_count, 
 .                              int stridx));
 .  void     (*_bfd_truncate_arname) PARAMS ((bfd *, CONST char *, char *));
 .  boolean  (*write_armap) PARAMS ((bfd *arch, 
 .                              unsigned int elength,
 .                              struct orl *map,
 .                              unsigned int orl_count, 
 .                              int stridx));

-
-Standard stuff.
-
-.  boolean       (*_close_and_cleanup) PARAMS ((bfd *));
-.  boolean       (*_bfd_set_section_contents) PARAMS ((bfd *, sec_ptr, PTR,
-.                                            file_ptr, bfd_size_type));
-.  boolean       (*_bfd_get_section_contents) PARAMS ((bfd *, sec_ptr, PTR, 
-.                                            file_ptr, bfd_size_type));
-.  boolean       (*_new_section_hook) PARAMS ((bfd *, sec_ptr));
-
-Symbols and relocations.
-
-.  unsigned int  (*_get_symtab_upper_bound) PARAMS ((bfd *));
-.  unsigned int  (*_bfd_canonicalize_symtab) PARAMS ((bfd *,
-.                                              struct symbol_cache_entry **));
-.  unsigned int  (*_get_reloc_upper_bound) PARAMS ((bfd *, sec_ptr));
-.  unsigned int  (*_bfd_canonicalize_reloc) PARAMS ((bfd *, sec_ptr, arelent **,
-.                                              struct symbol_cache_entry **));
+.  PTR (*_bfd_read_ar_hdr_fn) PARAMS ((bfd *));
+.  bfd *    (*openr_next_archived_file) PARAMS ((bfd *arch, bfd *prev));
+.#define bfd_get_elt_at_index(b,i) BFD_SEND(b, _bfd_get_elt_at_index, (b,i))
+.  bfd *    (*_bfd_get_elt_at_index) PARAMS ((bfd *, symindex));
+.  int      (*_bfd_stat_arch_elt) PARAMS ((bfd *, struct stat *));
+.  boolean  (*_bfd_update_armap_timestamp) PARAMS ((bfd *));
+.
+.  {* Entry points used for symbols.  *}
+.#define BFD_JUMP_TABLE_SYMBOLS(NAME)\
+.CAT(NAME,_get_symtab_upper_bound),\
+.CAT(NAME,_get_symtab),\
+.CAT(NAME,_make_empty_symbol),\
+.CAT(NAME,_print_symbol),\
+.CAT(NAME,_get_symbol_info),\
+.CAT(NAME,_bfd_is_local_label_name),\
+.CAT(NAME,_get_lineno),\
+.CAT(NAME,_find_nearest_line),\
+.CAT(NAME,_bfd_make_debug_symbol),\
+.CAT(NAME,_read_minisymbols),\
+.CAT(NAME,_minisymbol_to_symbol)
+.  long  (*_bfd_get_symtab_upper_bound) PARAMS ((bfd *));
+.  long  (*_bfd_canonicalize_symtab) PARAMS ((bfd *,
+.                                             struct symbol_cache_entry **));

 .  struct symbol_cache_entry  *
 .                (*_bfd_make_empty_symbol) PARAMS ((bfd *));
 .  void          (*_bfd_print_symbol) PARAMS ((bfd *, PTR,
 .  struct symbol_cache_entry  *
 .                (*_bfd_make_empty_symbol) PARAMS ((bfd *));
 .  void          (*_bfd_print_symbol) PARAMS ((bfd *, PTR,


@@ -271,64 +362,120 @@ Symbols and relocations.
 .                                      struct symbol_cache_entry *,
 .                                      symbol_info *));
 .#define bfd_get_symbol_info(b,p,e) BFD_SEND(b, _bfd_get_symbol_info, (b,p,e))
 .                                      struct symbol_cache_entry *,
 .                                      symbol_info *));
 .#define bfd_get_symbol_info(b,p,e) BFD_SEND(b, _bfd_get_symbol_info, (b,p,e))

-
-.  alent *    (*_get_lineno) PARAMS ((bfd *, struct symbol_cache_entry *));
-.
-.  boolean    (*_bfd_set_arch_mach) PARAMS ((bfd *, enum bfd_architecture,
-.                    unsigned long));
+.  boolean      (*_bfd_is_local_label_name) PARAMS ((bfd *, const char *));

 .
 .

-.  bfd *      (*openr_next_archived_file) PARAMS ((bfd *arch, bfd *prev));
-. 
+.  alent *    (*_get_lineno) PARAMS ((bfd *, struct symbol_cache_entry *));

 .  boolean    (*_bfd_find_nearest_line) PARAMS ((bfd *abfd,
 .                    struct sec *section, struct symbol_cache_entry **symbols,
 .                    bfd_vma offset, CONST char **file, CONST char **func,
 .                    unsigned int *line));
 .  boolean    (*_bfd_find_nearest_line) PARAMS ((bfd *abfd,
 .                    struct sec *section, struct symbol_cache_entry **symbols,
 .                    bfd_vma offset, CONST char **file, CONST char **func,
 .                    unsigned int *line));

-. 
-.  int        (*_bfd_stat_arch_elt) PARAMS ((bfd *, struct stat *));
+. {* 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) PARAMS ((
+.       bfd *abfd,
+.       void *ptr,
+.       unsigned long size));
+.#define bfd_read_minisymbols(b, d, m, s) \
+.  BFD_SEND (b, _read_minisymbols, (b, d, m, s))
+.  long  (*_read_minisymbols) PARAMS ((bfd *, boolean, PTR *,
+.                                      unsigned int *));
+.#define bfd_minisymbol_to_symbol(b, d, m, f) \
+.  BFD_SEND (b, _minisymbol_to_symbol, (b, d, m, f))
+.  asymbol *(*_minisymbol_to_symbol) PARAMS ((bfd *, boolean, const PTR,
+.                                             asymbol *));

 .
 .

-.  int        (*_bfd_sizeof_headers) PARAMS ((bfd *, boolean));
+.  {* Routines for relocs.  *}
+.#define BFD_JUMP_TABLE_RELOCS(NAME)\
+.CAT(NAME,_get_reloc_upper_bound),\
+.CAT(NAME,_canonicalize_reloc),\
+.CAT(NAME,_bfd_reloc_type_lookup)
+.  long  (*_get_reloc_upper_bound) PARAMS ((bfd *, sec_ptr));
+.  long  (*_bfd_canonicalize_reloc) PARAMS ((bfd *, sec_ptr, arelent **,
+.                                            struct symbol_cache_entry **));
+.  {* See documentation on reloc types.  *}
+.  reloc_howto_type *
+.       (*reloc_type_lookup) PARAMS ((bfd *abfd,
+.                                     bfd_reloc_code_real_type code));

 .
 .

-.  void       (*_bfd_debug_info_start) PARAMS ((bfd *));
-.  void       (*_bfd_debug_info_end) PARAMS ((bfd *));
-.  void       (*_bfd_debug_info_accumulate) PARAMS ((bfd *, struct sec *));
+.  {* Routines used when writing an object file.  *}
+.#define BFD_JUMP_TABLE_WRITE(NAME)\
+.CAT(NAME,_set_arch_mach),\
+.CAT(NAME,_set_section_contents)
+.  boolean    (*_bfd_set_arch_mach) PARAMS ((bfd *, enum bfd_architecture,
+.                    unsigned long));
+.  boolean       (*_bfd_set_section_contents) PARAMS ((bfd *, sec_ptr, PTR,
+.                                            file_ptr, bfd_size_type));

 .
 .

+.  {* Routines used by the linker.  *}
+.#define BFD_JUMP_TABLE_LINK(NAME)\
+.CAT(NAME,_sizeof_headers),\
+.CAT(NAME,_bfd_get_relocated_section_contents),\
+.CAT(NAME,_bfd_relax_section),\
+.CAT(NAME,_bfd_link_hash_table_create),\
+.CAT(NAME,_bfd_link_add_symbols),\
+.CAT(NAME,_bfd_final_link),\
+.CAT(NAME,_bfd_link_split_section),\
+.CAT(NAME,_bfd_gc_sections)
+.  int        (*_bfd_sizeof_headers) PARAMS ((bfd *, boolean));

 .  bfd_byte * (*_bfd_get_relocated_section_contents) PARAMS ((bfd *,
 .                    struct bfd_link_info *, struct bfd_link_order *,
 .                    bfd_byte *data, boolean relocateable,
 .                    struct symbol_cache_entry **));
 .
 .  boolean    (*_bfd_relax_section) PARAMS ((bfd *, struct sec *,
 .  bfd_byte * (*_bfd_get_relocated_section_contents) PARAMS ((bfd *,
 .                    struct bfd_link_info *, struct bfd_link_order *,
 .                    bfd_byte *data, boolean relocateable,
 .                    struct symbol_cache_entry **));
 .
 .  boolean    (*_bfd_relax_section) PARAMS ((bfd *, struct sec *,

-.                    struct bfd_link_info *, struct symbol_cache_entry **));
+.                    struct bfd_link_info *, boolean *again));

 .
 .

-. {* See documentation on reloc types.  *}
-. CONST struct reloc_howto_struct *
-.       (*reloc_type_lookup) PARAMS ((bfd *abfd,
-.                                     bfd_reloc_code_real_type code));
+.  {* 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) PARAMS ((bfd *));

 .
 .

-. {* 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) PARAMS ((
-.       bfd *abfd,
-.       void *ptr,
-.       unsigned long size));
+.  {* Add symbols from this object file into the hash table.  *}
+.  boolean (*_bfd_link_add_symbols) PARAMS ((bfd *, struct bfd_link_info *));

 .
 .

-. {* 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) PARAMS ((bfd *));
+.  {* Do a link based on the link_order structures attached to each
+.     section of the BFD.  *}
+.  boolean (*_bfd_final_link) PARAMS ((bfd *, struct bfd_link_info *));

 .
 .

-. {* Add symbols from this object file into the hash table.  *}
-. boolean (*_bfd_link_add_symbols) PARAMS ((bfd *, struct bfd_link_info *));
+.  {* Should this section be split up into smaller pieces during linking.  *}
+.  boolean (*_bfd_link_split_section) PARAMS ((bfd *, struct sec *));

 .
 .

-. {* Do a link based on the link_order structures attached to each
-.    section of the BFD.  *}
-. boolean (*_bfd_final_link) PARAMS ((bfd *, struct bfd_link_info *));
+.  {* Remove sections that are not referenced from the output.  *}
+.  boolean (*_bfd_gc_sections) PARAMS ((bfd *, struct bfd_link_info *));

 .
 .

+.  {* Routines to handle dynamic symbols and relocs.  *}
+.#define BFD_JUMP_TABLE_DYNAMIC(NAME)\
+.CAT(NAME,_get_dynamic_symtab_upper_bound),\
+.CAT(NAME,_canonicalize_dynamic_symtab),\
+.CAT(NAME,_get_dynamic_reloc_upper_bound),\
+.CAT(NAME,_canonicalize_dynamic_reloc)
+.  {* Get the amount of memory required to hold the dynamic symbols. *}
+.  long  (*_bfd_get_dynamic_symtab_upper_bound) PARAMS ((bfd *));
+.  {* Read in the dynamic symbols.  *}
+.  long  (*_bfd_canonicalize_dynamic_symtab)
+.    PARAMS ((bfd *, struct symbol_cache_entry **));
+.  {* Get the amount of memory required to hold the dynamic relocs.  *}
+.  long  (*_bfd_get_dynamic_reloc_upper_bound) PARAMS ((bfd *));
+.  {* Read in the dynamic relocs.  *}
+.  long  (*_bfd_canonicalize_dynamic_reloc)
+.    PARAMS ((bfd *, arelent **, struct symbol_cache_entry **));
+.
+
+A pointer to an alternative bfd_target in case the current one is not
+satisfactory.  This can happen when the target cpu supports both big
+and little endian code, and target chosen by the linker has the wrong
+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.  *}  
+. const struct bfd_target * alternative_target;
+. 

 
 Data for use by back-end routines, which isn't generic enough to belong
 in this structure.
 
 . PTR backend_data;
 
 Data for use by back-end routines, which isn't generic enough to belong
 in this structure.
 
 . PTR backend_data;

+. 

 .} bfd_target;
 
 */
 .} bfd_target;
 
 */


@@ -337,84 +484,174 @@ in this structure.
    Alphabetized for easy reference.
    They are listed a second time below, since
    we can't intermix extern's and initializers.  */
    Alphabetized for easy reference.
    They are listed a second time below, since
    we can't intermix extern's and initializers.  */

-extern bfd_target a29kcoff_big_vec;
-extern bfd_target a_out_adobe_vec;
-extern bfd_target aout_mips_big_vec;
-extern bfd_target aout_mips_little_vec;
-extern bfd_target apollocoff_vec;
-extern bfd_target b_out_vec_big_host;
-extern bfd_target b_out_vec_little_host;
-extern bfd_target bfd_elf32_big_generic_vec;
-extern bfd_target bfd_elf32_bigmips_vec;
-extern bfd_target bfd_elf32_hppa_vec;
-extern bfd_target bfd_elf32_i386_vec;
-extern bfd_target bfd_elf32_i860_vec;
-extern bfd_target bfd_elf32_little_generic_vec;
-extern bfd_target bfd_elf32_littlemips_vec;
-extern bfd_target bfd_elf32_m68k_vec;
-extern bfd_target bfd_elf32_m88k_vec;
-extern bfd_target bfd_elf32_sparc_vec;
-extern bfd_target bfd_elf64_big_generic_vec;
-extern bfd_target bfd_elf64_little_generic_vec;
-/* start-sanitize-v9 */
-extern bfd_target bfd_elf64_sparc_vec;
-/* end-sanitize-v9 */
-extern bfd_target demo_64_vec;
-extern bfd_target ecoff_big_vec;
-extern bfd_target ecoff_little_vec;
-extern bfd_target ecoffalpha_little_vec;
-extern bfd_target h8300coff_vec;
-extern bfd_target h8500coff_vec;
-extern bfd_target host_aout_vec;
-extern bfd_target hp300bsd_vec;
-extern bfd_target hp300hpux_vec;
-extern bfd_target som_vec;
-extern bfd_target i386aout_vec;
-extern bfd_target i386bsd_vec;
-extern bfd_target netbsd386_vec;
-extern bfd_target i386coff_vec;
-extern bfd_target i386linux_vec;
-extern bfd_target i386lynx_aout_vec;
-extern bfd_target i386lynx_coff_vec;
-extern bfd_target i386mach3_vec;
-extern bfd_target icoff_big_vec;
-extern bfd_target icoff_little_vec;
-extern bfd_target ieee_vec;
-extern bfd_target m68kcoff_vec;
-extern bfd_target m68kcoffun_vec;
-extern bfd_target m68klynx_aout_vec;
-extern bfd_target m68klynx_coff_vec;
-extern bfd_target m88kbcs_vec;
-extern bfd_target newsos3_vec;
-extern bfd_target nlm32_i386_vec;
-extern bfd_target nlm32_sparc_vec;
-extern bfd_target nlm32_alpha_vec;
-extern bfd_target oasys_vec;
-extern bfd_target rs6000coff_vec;
-extern bfd_target shcoff_vec;
-extern bfd_target sparclynx_aout_vec;
-extern bfd_target sparclynx_coff_vec;
-extern bfd_target sparccoff_vec;
-extern bfd_target sunos_big_vec;
-extern bfd_target tekhex_vec;
-extern bfd_target we32kcoff_vec;
-extern bfd_target z8kcoff_vec;
+extern const bfd_target a29kcoff_big_vec;
+extern const bfd_target a_out_adobe_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 aout0_big_vec;
+extern const bfd_target apollocoff_vec;
+extern const bfd_target armcoff_little_vec;
+extern const bfd_target armcoff_big_vec;
+extern const bfd_target armnetbsd_vec;
+extern const bfd_target armpe_little_vec;
+extern const bfd_target armpe_big_vec;
+extern const bfd_target armpei_little_vec;
+extern const bfd_target armpei_big_vec;
+extern const bfd_target arm_epoc_pe_little_vec;
+extern const bfd_target arm_epoc_pe_big_vec;
+extern const bfd_target arm_epoc_pei_little_vec;
+extern const bfd_target arm_epoc_pei_big_vec;
+extern const bfd_target b_out_vec_big_host;
+extern const bfd_target b_out_vec_little_host;
+extern const bfd_target bfd_elf64_alpha_vec;
+extern const bfd_target bfd_elf32_bigarc_vec;
+extern const bfd_target bfd_elf32_bigarm_vec;
+extern const bfd_target bfd_elf32_bigarm_oabi_vec;
+extern const bfd_target bfd_elf32_littlearc_vec;
+extern const bfd_target bfd_elf32_littlearm_vec;
+extern const bfd_target bfd_elf32_littlearm_oabi_vec;
+extern const bfd_target bfd_elf32_big_generic_vec;
+extern const bfd_target bfd_elf32_bigmips_vec;
+extern const bfd_target bfd_elf64_bigmips_vec;
+extern const bfd_target bfd_elf32_d10v_vec;
+extern const bfd_target bfd_elf32_d30v_vec;
+extern const bfd_target bfd_elf32_hppa_vec;
+extern const bfd_target bfd_elf32_i386_vec;
+extern const bfd_target bfd_elf32_i860_vec;
+extern const bfd_target bfd_elf32_i960_vec;
+extern const bfd_target bfd_elf32_little_generic_vec;
+extern const bfd_target bfd_elf32_littlemips_vec;
+extern const bfd_target bfd_elf64_littlemips_vec;
+extern const bfd_target bfd_elf32_m32r_vec;
+extern const bfd_target bfd_elf32_m68k_vec;
+extern const bfd_target bfd_elf32_m88k_vec;
+extern const bfd_target bfd_elf32_mn10200_vec;
+extern const bfd_target bfd_elf32_mn10300_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_sh_vec;
+extern const bfd_target bfd_elf32_shl_vec;
+extern const bfd_target bfd_elf32_sparc_vec;
+extern const bfd_target bfd_elf32_v850_vec;
+extern const bfd_target bfd_elf32_fr30_vec;
+extern const bfd_target bfd_elf32_mcore_big_vec;
+extern const bfd_target bfd_elf32_mcore_little_vec;
+extern const bfd_target bfd_elf64_big_generic_vec;
+extern const bfd_target bfd_elf64_little_generic_vec;
+extern const bfd_target bfd_elf64_sparc_vec;
+extern const bfd_target demo_64_vec;
+extern const bfd_target ecoff_big_vec;
+extern const bfd_target ecoff_little_vec;
+extern const bfd_target ecoff_biglittle_vec;
+extern const bfd_target ecoffalpha_little_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 som_vec;
+extern const bfd_target i386aout_vec;
+extern const bfd_target i386bsd_vec;
+extern const bfd_target i386dynix_vec;
+extern const bfd_target i386freebsd_vec;
+extern const bfd_target i386os9k_vec;
+extern const bfd_target i386coff_vec;
+extern const bfd_target bfd_powerpc_pe_vec;
+extern const bfd_target bfd_powerpcle_pe_vec;
+extern const bfd_target bfd_powerpc_pei_vec;
+extern const bfd_target bfd_powerpcle_pei_vec;
+extern const bfd_target i386pe_vec;
+extern const bfd_target i386pei_vec;
+extern const bfd_target go32coff_vec;
+extern const bfd_target go32stubbedcoff_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 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 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 m68klynx_aout_vec;
+extern const bfd_target m68klynx_coff_vec;
+extern const bfd_target m68knetbsd_vec;
+extern const bfd_target m68ksysvcoff_vec;
+extern const bfd_target m68k4knetbsd_vec;
+extern const bfd_target m88kbcs_vec;
+extern const bfd_target m88kmach3_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 newsos3_vec;
+extern const bfd_target nlm32_i386_vec;
+extern const bfd_target nlm32_sparc_vec;
+extern const bfd_target nlm32_alpha_vec;
+extern const bfd_target nlm32_powerpc_vec;
+extern const bfd_target pc532netbsd_vec;
+extern const bfd_target oasys_vec;
+extern const bfd_target pc532machaout_vec;
+extern const bfd_target ppcboot_vec;
+extern const bfd_target riscix_vec;
+extern const bfd_target pmac_xcoff_vec;
+extern const bfd_target rs6000coff_vec;
+extern const bfd_target shcoff_vec;
+extern const bfd_target shlcoff_vec;
+extern const bfd_target shcoff_small_vec;
+extern const bfd_target shlcoff_small_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 sparccoff_vec;
+extern const bfd_target sunos_big_vec;
+extern const bfd_target tekhex_vec;
+extern const bfd_target tic30_aout_vec;
+extern const bfd_target tic30_coff_vec;
+extern const bfd_target tic80coff_vec;
+extern const bfd_target vaxnetbsd_vec;
+extern const bfd_target versados_vec;
+extern const bfd_target vms_alpha_vec;
+extern const bfd_target vms_vax_vec;
+extern const bfd_target we32kcoff_vec;
+extern const bfd_target w65_vec;
+extern const bfd_target z8kcoff_vec;

 
 /* srec is always included.  */
 
 /* srec is always included.  */

-extern bfd_target srec_vec;
-extern bfd_target symbolsrec_vec;
+extern const bfd_target srec_vec;
+extern const bfd_target symbolsrec_vec;

 
 

-/* All of the xvecs for core files.  */
-extern bfd_target aix386_core_vec;
-extern bfd_target hpux_core_vec;
-extern bfd_target hppabsd_core_vec;
-extern bfd_target irix_core_vec;
-extern bfd_target osf_core_vec;
-extern bfd_target sco_core_vec;
-extern bfd_target trad_core_vec;
-extern bfd_target ptrace_core_vec;
+/* binary is always included.  */
+extern const bfd_target binary_vec;

 
 

-bfd_target *bfd_target_vector[] = {
+/* ihex is always included.  */
+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 hpux_core_vec;
+extern const bfd_target hppabsd_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 sco5_core_vec;
+extern const bfd_target trad_core_vec;
+extern const bfd_target ptrace_core_vec;
+
+const bfd_target * const bfd_target_vector[] = {

 
 #ifdef SELECT_VECS
 
 
 #ifdef SELECT_VECS
 


@@ -441,34 +678,67 @@ bfd_target *bfd_target_vector[] = {
        &b_out_vec_little_host,
 
        /* This, and other vectors, may not be used in any *.mt configuration.
        &b_out_vec_little_host,
 
        /* This, and other vectors, may not be used in any *.mt configuration.

-          But that does not mean they are unnecessary.  If configured
-          --with-targets=all, objdump or gdb should be able to examine
+          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,
           the file even if we don't recognize the machine type.  */
        &bfd_elf32_big_generic_vec,

+#ifdef BFD64
+       &bfd_elf64_alpha_vec,
+#endif
+       &bfd_elf32_bigarc_vec,
+        &bfd_elf32_bigarm_vec,
+        &bfd_elf32_bigarm_oabi_vec,

        &bfd_elf32_bigmips_vec,
        &bfd_elf32_bigmips_vec,

+#ifdef BFD64
+       &bfd_elf64_bigmips_vec,
+#endif
+       &bfd_elf32_d10v_vec,
+       &bfd_elf32_d30v_vec,
+#if 0

        &bfd_elf32_hppa_vec,
        &bfd_elf32_hppa_vec,

+#endif

        &bfd_elf32_i386_vec,
        &bfd_elf32_i860_vec,
        &bfd_elf32_i386_vec,
        &bfd_elf32_i860_vec,

+       &bfd_elf32_i960_vec,

        &bfd_elf32_little_generic_vec,
        &bfd_elf32_little_generic_vec,

+       &bfd_elf32_littlearc_vec,
+        &bfd_elf32_littlearm_vec,
+        &bfd_elf32_littlearm_oabi_vec,

        &bfd_elf32_littlemips_vec,
        &bfd_elf32_littlemips_vec,

+#ifdef BFD64
+       &bfd_elf64_littlemips_vec,
+#endif
+       &bfd_elf32_m32r_vec,
+       &bfd_elf32_mn10200_vec,
+       &bfd_elf32_mn10300_vec,

        &bfd_elf32_m68k_vec,
        &bfd_elf32_m88k_vec,
        &bfd_elf32_sparc_vec,
        &bfd_elf32_m68k_vec,
        &bfd_elf32_m88k_vec,
        &bfd_elf32_sparc_vec,

+       &bfd_elf32_pj_vec,
+       &bfd_elf32_pjl_vec,
+       &bfd_elf32_powerpc_vec,
+       &bfd_elf32_powerpcle_vec,
+       &bfd_elf32_v850_vec,
+       &bfd_elf32_fr30_vec,
+       &bfd_elf32_mcore_big_vec,
+       &bfd_elf32_mcore_little_vec,

 #ifdef BFD64                   /* No one seems to use this.  */
        &bfd_elf64_big_generic_vec,
        &bfd_elf64_little_generic_vec,
 #endif
 #ifdef BFD64                   /* No one seems to use this.  */
        &bfd_elf64_big_generic_vec,
        &bfd_elf64_little_generic_vec,
 #endif

-/* start-sanitize-v9 */

 #if 0
        &bfd_elf64_sparc_vec,
 #endif
 #if 0
        &bfd_elf64_sparc_vec,
 #endif

-/* end-sanitize-v9 */
+       /* 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.  */

 #ifdef BFD64
        &demo_64_vec,   /* Only compiled if host has long-long support */
 #endif
        &ecoff_big_vec,
        &ecoff_little_vec,
 #ifdef BFD64
        &demo_64_vec,   /* Only compiled if host has long-long support */
 #endif
        &ecoff_big_vec,
        &ecoff_little_vec,

-#if 0
+       &ecoff_biglittle_vec,
+#ifdef BFD64

        &ecoffalpha_little_vec,
 #endif
        &h8300coff_vec,
        &ecoffalpha_little_vec,
 #endif
        &h8300coff_vec,


@@ -487,8 +757,15 @@ bfd_target *bfd_target_vector[] = {
 #endif
        &i386aout_vec,
        &i386bsd_vec,
 #endif
        &i386aout_vec,
        &i386bsd_vec,

-       &netbsd386_vec,

        &i386coff_vec,
        &i386coff_vec,

+       &i386freebsd_vec,
+       &i860coff_vec,
+       &bfd_powerpc_pe_vec,
+       &bfd_powerpcle_pe_vec,
+       &bfd_powerpc_pei_vec,
+       &bfd_powerpcle_pei_vec,
+       &go32coff_vec,
+       &go32stubbedcoff_vec,

 #if 0
        /* Since a.out files lack decent magic numbers, no way to recognize
           which kind of a.out file it is.  */
 #if 0
        /* Since a.out files lack decent magic numbers, no way to recognize
           which kind of a.out file it is.  */


@@ -496,20 +773,53 @@ bfd_target *bfd_target_vector[] = {
 #endif
        &i386lynx_aout_vec,
        &i386lynx_coff_vec,
 #endif
        &i386lynx_aout_vec,
        &i386lynx_coff_vec,

+#if 0
+       /* No distinguishing features for Mach 3 executables.  */
+       &i386mach3_vec,
+#endif
+       &i386msdos_vec,
+       &i386netbsd_vec,
+       &i386os9k_vec,
+       &i386pe_vec,
+       &i386pei_vec,
+       &armcoff_little_vec,
+       &armcoff_big_vec,
+       &armnetbsd_vec,
+       &armpe_little_vec,
+       &armpe_big_vec,
+       &armpei_little_vec,
+       &armpei_big_vec,
+       &arm_epoc_pe_little_vec,
+       &arm_epoc_pe_big_vec,
+       &arm_epoc_pei_little_vec,
+       &arm_epoc_pei_big_vec,

        &icoff_big_vec,
        &icoff_little_vec,
        &ieee_vec,
        &m68kcoff_vec,
        &m68kcoffun_vec,
        &icoff_big_vec,
        &icoff_little_vec,
        &ieee_vec,
        &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,
+#endif

        &m68klynx_aout_vec,
        &m68klynx_coff_vec,
        &m68klynx_aout_vec,
        &m68klynx_coff_vec,

+       &m68knetbsd_vec,
+       &m68ksysvcoff_vec,

        &m88kbcs_vec,
        &m88kbcs_vec,

+       &m88kmach3_vec,
+       &mcore_pe_big_vec,
+       &mcore_pe_little_vec,
+       &mcore_pei_big_vec,
+       &mcore_pei_little_vec,

        &newsos3_vec,
        &nlm32_i386_vec,
        &nlm32_sparc_vec,
 #ifdef BFD64
        &nlm32_alpha_vec,
 #endif
        &newsos3_vec,
        &nlm32_i386_vec,
        &nlm32_sparc_vec,
 #ifdef BFD64
        &nlm32_alpha_vec,
 #endif

+       &pc532netbsd_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...
 #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...


@@ -517,15 +827,40 @@ bfd_target *bfd_target_vector[] = {
           Worse, since there is no magic number for archives, there
           can be annoying target mis-matches.  */
        &oasys_vec,
           Worse, since there is no magic number for archives, there
           can be annoying target mis-matches.  */
        &oasys_vec,

+#endif
+       &pc532machaout_vec,
+#if 0
+       /* We have no way of distinguishing these from other a.out variants */
+       &aout_arm_big_vec,
+       &aout_arm_little_vec,
+       &riscix_vec,
+#endif
+#if 0
+       /* This has the same magic number as RS/6000. */
+       &pmac_xcoff_vec,

 #endif
        &rs6000coff_vec,
 #endif
        &rs6000coff_vec,

+       &ppcboot_vec,

        &shcoff_vec,
        &shcoff_vec,

+       &shlcoff_vec,
+       &shcoff_small_vec,
+       &shlcoff_small_vec,
+       &sparcle_aout_vec,
+       &sparclinux_vec,

        &sparclynx_aout_vec,
        &sparclynx_coff_vec,
        &sparclynx_aout_vec,
        &sparclynx_coff_vec,

+       &sparcnetbsd_vec,

        &sunos_big_vec,
        &sunos_big_vec,

-#if 0
-       &tekhex_vec,
+       &aout0_big_vec,
+       &tic30_aout_vec,
+       &tic30_coff_vec,
+       &tic80coff_vec,
+       &vaxnetbsd_vec,
+       &versados_vec,
+#ifdef BFD64
+       &vms_alpha_vec,

 #endif
 #endif

+       &vms_vax_vec,

        &we32kcoff_vec,
        &z8kcoff_vec,
 
        &we32kcoff_vec,
        &z8kcoff_vec,
 


@@ -534,6 +869,12 @@ bfd_target *bfd_target_vector[] = {
 /* Always support S-records, for convenience.  */
        &srec_vec,
        &symbolsrec_vec,
 /* Always support S-records, for convenience.  */
        &srec_vec,
        &symbolsrec_vec,

+/* And tekhex */
+       &tekhex_vec,
+/* Likewise for binary output.  */
+       &binary_vec,
+/* Likewise for ihex.  */
+       &ihex_vec,

 
 /* Add any required traditional-core-file-handler.  */
 
 
 /* Add any required traditional-core-file-handler.  */
 


@@ -549,9 +890,15 @@ bfd_target *bfd_target_vector[] = {
 #ifdef IRIX_CORE
        &irix_core_vec,
 #endif
 #ifdef IRIX_CORE
        &irix_core_vec,
 #endif

+#ifdef NETBSD_CORE
+       &netbsd_core_vec,
+#endif

 #ifdef OSF_CORE
        &osf_core_vec,
 #endif
 #ifdef OSF_CORE
        &osf_core_vec,
 #endif

+#ifdef SCO5_CORE
+       &sco5_core_vec,
+#endif

 #ifdef TRAD_CORE
        &trad_core_vec,
 #endif
 #ifdef TRAD_CORE
        &trad_core_vec,
 #endif


@@ -566,7 +913,7 @@ bfd_target *bfd_target_vector[] = {
 /* bfd_default_vector[0] contains either the address of the default vector,
    if there is one, or zero if there isn't.  */
 
 /* bfd_default_vector[0] contains either the address of the default vector,
    if there is one, or zero if there isn't.  */
 

-bfd_target *bfd_default_vector[] = {
+const bfd_target *bfd_default_vector[] = {

 #ifdef DEFAULT_VECTOR
        &DEFAULT_VECTOR,
 #endif
 #ifdef DEFAULT_VECTOR
        &DEFAULT_VECTOR,
 #endif


@@ -576,14 +923,96 @@ bfd_target *bfd_default_vector[] = {
 /* When there is an ambiguous match, bfd_check_format_matches puts the
    names of the matching targets in an array.  This variable is the maximum
    number of entries that the array could possibly need.  */
 /* When there is an ambiguous match, bfd_check_format_matches puts the
    names of the matching targets in an array.  This variable is the maximum
    number of entries that the array could possibly need.  */

-CONST size_t _bfd_target_vector_entries = sizeof(bfd_target_vector)/sizeof(*bfd_target_vector);
+const size_t _bfd_target_vector_entries = sizeof(bfd_target_vector)/sizeof(*bfd_target_vector);
+\f
+/* This array maps configuration triplets onto BFD vectors.  */
+
+struct targmatch
+{
+  /* The configuration triplet.  */
+  const char *triplet;
+  /* The BFD vector.  If this is NULL, then the vector is found by
+     searching forward for the next structure with a non NULL vector
+     field.  */
+  const bfd_target *vector;
+};
+
+/* targmatch.h is built by Makefile out of config.bfd.  */
+static const struct targmatch bfd_target_match[] = {
+#include "targmatch.h"
+  { NULL, NULL }
+};
+
+static const bfd_target *find_target PARAMS ((const char *));
+
+/* Find a target vector, given a name or configuration triplet.  */
+
+static const bfd_target *
+find_target (name)
+     const char *name;
+{
+  const bfd_target * const *target;
+  const struct targmatch *match;
+
+  for (target = &bfd_target_vector[0]; *target != NULL; target++)
+    if (strcmp (name, (*target)->name) == 0)
+      return *target;
+
+  /* If we couldn't match on the exact name, try matching on the
+     configuration triplet.  FIXME: We should run the triplet through
+     config.sub first, but that is hard.  */
+  for (match = &bfd_target_match[0]; match->triplet != NULL; match++)
+    {
+      if (fnmatch (match->triplet, name, 0) == 0)
+       {
+         while (match->vector == NULL)
+           ++match;
+         return match->vector;
+         break;
+       }
+    }
+
+  bfd_set_error (bfd_error_invalid_target);
+  return NULL;
+}
+
+/*
+FUNCTION
+       bfd_set_default_target
+
+SYNOPSIS
+       boolean bfd_set_default_target (const char *name);
+
+DESCRIPTION
+       Set the default target vector to use when recognizing a BFD.
+       This takes the name of the target, which may be a BFD target
+       name or a configuration triplet.
+*/
+
+boolean
+bfd_set_default_target (name)
+     const char *name;
+{
+  const bfd_target *target;
+
+  if (bfd_default_vector[0] != NULL
+      && strcmp (name, bfd_default_vector[0]->name) == 0)
+    return true;
+
+  target = find_target (name);
+  if (target == NULL)
+    return false;
+
+  bfd_default_vector[0] = target;
+  return true;
+}

 
 /*
 FUNCTION
        bfd_find_target
 
 SYNOPSIS
 
 /*
 FUNCTION
        bfd_find_target
 
 SYNOPSIS

-       bfd_target *bfd_find_target(CONST char *target_name, bfd *abfd);
+       const bfd_target *bfd_find_target(CONST char *target_name, bfd *abfd);

 
 DESCRIPTION
        Return a pointer to the transfer vector for the object target
 
 DESCRIPTION
        Return a pointer to the transfer vector for the object target


@@ -597,40 +1026,46 @@ DESCRIPTION
        targets to find the one that matches the file being read.   
 */
 
        targets to find the one that matches the file being read.   
 */
 

-bfd_target *
-DEFUN(bfd_find_target,(target_name, abfd),
-      CONST char *target_name AND
-      bfd *abfd)
+const bfd_target *
+bfd_find_target (target_name, abfd)
+     const char *target_name;
+     bfd *abfd;

 {
 {

-  bfd_target **target;
-  extern char *getenv ();
-  CONST char *targname = (target_name ? target_name : 
-                         (CONST char *) getenv ("GNUTARGET"));
+  const char *targname;
+  const bfd_target *target;
+
+  if (target_name != NULL)
+    targname = target_name;
+  else
+    targname = getenv ("GNUTARGET");

 
   /* This is safe; the vector cannot be null */
 
   /* This is safe; the vector cannot be null */

-  if (targname == NULL || !strcmp (targname, "default")) {
-    abfd->target_defaulted = true;
-    return abfd->xvec = bfd_target_vector[0];
-  }
+  if (targname == NULL || strcmp (targname, "default") == 0)
+    {
+      abfd->target_defaulted = true;
+      if (bfd_default_vector[0] != NULL)
+       abfd->xvec = bfd_default_vector[0];
+      else
+       abfd->xvec = bfd_target_vector[0];
+      return abfd->xvec;
+    }

 
   abfd->target_defaulted = false;
 
 
   abfd->target_defaulted = false;
 

-  for (target = &bfd_target_vector[0]; *target != NULL; target++) {
-    if (!strcmp (targname, (*target)->name))
-      return abfd->xvec = *target;
-  }
+  target = find_target (targname);
+  if (target == NULL)
+    return NULL;

 
 

-  bfd_set_error (bfd_error_invalid_target);
-  return NULL;
+  abfd->xvec = target;
+  return target;

 }
 
 }
 

-

 /*
 FUNCTION
        bfd_target_list
 
 SYNOPSIS
 /*
 FUNCTION
        bfd_target_list
 
 SYNOPSIS

-       CONST char **bfd_target_list(void);
+       const char **bfd_target_list(void);

 
 DESCRIPTION
        Return a freshly malloced NULL-terminated
 
 DESCRIPTION
        Return a freshly malloced NULL-terminated


@@ -639,16 +1074,16 @@ DESCRIPTION
 
 */
 
 
 */
 

-CONST char **
-DEFUN_VOID(bfd_target_list)
+const char **
+bfd_target_list ()

 {
   int vec_length= 0;
 {
   int vec_length= 0;

-#ifdef NATIVE_HPPAHPUX_COMPILER
+#if defined (HOST_HPPAHPUX) && ! defined (__STDC__)

   /* The native compiler on the HP9000/700 has a bug which causes it
      to loop endlessly when compiling this file.  This avoids it.  */
   volatile
 #endif
   /* The native compiler on the HP9000/700 has a bug which causes it
      to loop endlessly when compiling this file.  This avoids it.  */
   volatile
 #endif

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

   CONST  char **name_list, **name_ptr;
 
   for (target = &bfd_target_vector[0]; *target != NULL; target++)
   CONST  char **name_list, **name_ptr;
 
   for (target = &bfd_target_vector[0]; *target != NULL; target++)


@@ -657,13 +1092,40 @@ DEFUN_VOID(bfd_target_list)
   name_ptr = name_list = (CONST char **)
     bfd_zmalloc ((vec_length + 1) * sizeof (char **));
 
   name_ptr = name_list = (CONST char **)
     bfd_zmalloc ((vec_length + 1) * sizeof (char **));
 

-  if (name_list == NULL) {
-    bfd_set_error (bfd_error_no_memory);
+  if (name_list == NULL)

     return NULL;
     return NULL;

-  }

 
   for (target = &bfd_target_vector[0]; *target != NULL; target++)
     *(name_ptr++) = (*target)->name;
 
   return name_list;
 }
 
   for (target = &bfd_target_vector[0]; *target != NULL; target++)
     *(name_ptr++) = (*target)->name;
 
   return name_list;
 }

+
+/*
+FUNCTION
+       bfd_seach_for_target
+
+SYNOPSIS
+       const bfd_target * bfd_search_for_target (int (* search_func)(const bfd_target *, void *), void *);
+
+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.
+*/
+
+const bfd_target *
+bfd_search_for_target (search_func, data)
+     int (* search_func) PARAMS ((const bfd_target * target, void * data));
+     void * data;
+{
+  const bfd_target * const * target;
+
+  for (target = bfd_target_vector; * target != NULL; target ++)
+    if (search_func (* target, data))
+      return * target;
+
+  return NULL;
+}