2003-04-11 Andrew Cagney <cagney@redhat.com>

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

diff --git a/bfd/targets.c b/bfd/targets.c
index 0972d7f4038ef914933bb8a63829c6a3c44afc26..5ccae2a9928fce88c655cef36dc1753e7947532c 100644 (file)
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -1,24 +1,24 @@
 /* Generic target-file-type support for the BFD library.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 /* Generic target-file-type support for the BFD library.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,

-   2000, 2001
+   2000, 2001, 2002, 2003

    Free Software Foundation, Inc.
    Written by Cygnus Support.
 
    Free Software Foundation, Inc.
    Written by Cygnus Support.
 

-This file is part of BFD, the Binary File Descriptor library.
+   This file is part of BFD, the Binary File Descriptor library.

 
 

-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.

 
 

-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

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


@@ -70,7 +70,7 @@ DESCRIPTION
        <<bfd_check_format>> on the BFD with a suggested format.
        If <<target_defaulted>> has been set, each possible target
        type is tried to see if it recognizes the specified format.
        <<bfd_check_format>> on the BFD with a suggested format.
        If <<target_defaulted>> has been set, each possible target
        type is tried to see if it recognizes the specified format.

-       <<bfd_check_format>> returns <<true>> when the caller guesses right.
+       <<bfd_check_format>> returns <<TRUE>> when the caller guesses right.

 @menu
 @* bfd_target::
 @end menu
 @menu
 @* bfd_target::
 @end menu


@@ -125,7 +125,7 @@ DESCRIPTION
 .   (((bfd)->xvec->message[(int) ((bfd)->format)]) arglist) : \
 .   (bfd_assert (__FILE__,__LINE__), NULL))
 .#endif
 .   (((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
        module that implements access to a different target under BFD,
        This is the structure which defines the type of BFD this is.  The
        <<xvec>> member of the struct <<bfd>> itself points here.  Each
        module that implements access to a different target under BFD,


@@ -135,7 +135,8 @@ DESCRIPTION
        the entry points which call them. Too bad we can't have one
        macro to define them both!
 
        the entry points which call them. Too bad we can't have one
        macro to define them both!
 

-.enum bfd_flavour {
+.enum bfd_flavour
+.{

 .  bfd_target_unknown_flavour,
 .  bfd_target_aout_flavour,
 .  bfd_target_coff_flavour,
 .  bfd_target_unknown_flavour,
 .  bfd_target_aout_flavour,
 .  bfd_target_coff_flavour,


@@ -153,7 +154,12 @@ DESCRIPTION
 .  bfd_target_versados_flavour,
 .  bfd_target_msdos_flavour,
 .  bfd_target_ovax_flavour,
 .  bfd_target_versados_flavour,
 .  bfd_target_msdos_flavour,
 .  bfd_target_ovax_flavour,

-.  bfd_target_evax_flavour
+.  bfd_target_evax_flavour,
+.  bfd_target_mmo_flavour,
+.  bfd_target_mach_o_flavour,
+.  bfd_target_pef_flavour,
+.  bfd_target_pef_xlib_flavour,
+.  bfd_target_sym_flavour

 .};
 .
 .enum bfd_endian { BFD_ENDIAN_BIG, BFD_ENDIAN_LITTLE, BFD_ENDIAN_UNKNOWN };
 .};
 .
 .enum bfd_endian { BFD_ENDIAN_BIG, BFD_ENDIAN_LITTLE, BFD_ENDIAN_UNKNOWN };


@@ -163,51 +169,40 @@ DESCRIPTION
 .
 .typedef struct bfd_target
 .{
 .
 .typedef struct bfd_target
 .{

-
-Identifies the kind of target, e.g., SunOS4, Ultrix, etc.
-
+.  {* Identifies the kind of target, e.g., SunOS4, Ultrix, etc.  *}

 .  char *name;
 .  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.  *}

 .  enum bfd_flavour flavour;
 .  enum bfd_flavour flavour;

-
-The order of bytes within the data area of a file.
-
+.
+.  {* The order of bytes within the data area of a file.  *}

 .  enum bfd_endian byteorder;
 .  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.  *}

 .  enum bfd_endian header_byteorder;
 .  enum bfd_endian header_byteorder;

-
-A mask of all the flags which an executable may have set -
-from the set <<BFD_NO_FLAGS>>, <<HAS_RELOC>>, ...<<D_PAGED>>.
-
+.
+.  {* A mask of all the flags which an executable may have set -
+.     from the set <<BFD_NO_FLAGS>>, <<HAS_RELOC>>, ...<<D_PAGED>>.  *}

 .  flagword object_flags;
 .  flagword object_flags;

-
-A mask of all the flags which a section may have set - from
-the set <<SEC_NO_FLAGS>>, <<SEC_ALLOC>>, ...<<SET_NEVER_LOAD>>.
-
+.
+. {* A mask of all the flags which a section may have set - from
+.    the set <<SEC_NO_FLAGS>>, <<SEC_ALLOC>>, ...<<SET_NEVER_LOAD>>.  *}

 .  flagword section_flags;
 .  flagword section_flags;

-
-The character normally found at the front of a symbol
-(if any), perhaps `_'.
-
+.
+. {* The character normally found at the front of a symbol.
+.    (if any), perhaps `_'.  *}

 .  char symbol_leading_char;
 .  char symbol_leading_char;

-
-The pad character for file names within an archive header.
-
+.
+. {* The pad character for file names within an archive header.  *}

 .  char ar_pad_char;
 .  char ar_pad_char;

-
-The maximum number of characters in an archive header.
-
+.
+.  {* The maximum number of characters in an archive header.  *}

 .  unsigned short ar_max_namelen;
 .  unsigned short ar_max_namelen;

-
-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.  *}

 .  bfd_vma        (*bfd_getx64) PARAMS ((const bfd_byte *));
 .  bfd_signed_vma (*bfd_getx_signed_64) PARAMS ((const bfd_byte *));
 .  void           (*bfd_putx64) PARAMS ((bfd_vma, bfd_byte *));
 .  bfd_vma        (*bfd_getx64) PARAMS ((const bfd_byte *));
 .  bfd_signed_vma (*bfd_getx_signed_64) PARAMS ((const bfd_byte *));
 .  void           (*bfd_putx64) PARAMS ((bfd_vma, bfd_byte *));


@@ -217,9 +212,8 @@ Certain other handlers could do the same.
 .  bfd_vma        (*bfd_getx16) PARAMS ((const bfd_byte *));
 .  bfd_signed_vma (*bfd_getx_signed_16) PARAMS ((const bfd_byte *));
 .  void           (*bfd_putx16) PARAMS ((bfd_vma, bfd_byte *));
 .  bfd_vma        (*bfd_getx16) PARAMS ((const bfd_byte *));
 .  bfd_signed_vma (*bfd_getx_signed_16) PARAMS ((const bfd_byte *));
 .  void           (*bfd_putx16) PARAMS ((bfd_vma, bfd_byte *));

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

 .  bfd_vma        (*bfd_h_getx64) PARAMS ((const bfd_byte *));
 .  bfd_signed_vma (*bfd_h_getx_signed_64) PARAMS ((const bfd_byte *));
 .  void           (*bfd_h_putx64) PARAMS ((bfd_vma, bfd_byte *));
 .  bfd_vma        (*bfd_h_getx64) PARAMS ((const bfd_byte *));
 .  bfd_signed_vma (*bfd_h_getx_signed_64) PARAMS ((const bfd_byte *));
 .  void           (*bfd_h_putx64) PARAMS ((bfd_vma, bfd_byte *));


@@ -229,230 +223,243 @@ Byte swapping for the headers
 .  bfd_vma        (*bfd_h_getx16) PARAMS ((const bfd_byte *));
 .  bfd_signed_vma (*bfd_h_getx_signed_16) PARAMS ((const bfd_byte *));
 .  void           (*bfd_h_putx16) PARAMS ((bfd_vma, bfd_byte *));
 .  bfd_vma        (*bfd_h_getx16) PARAMS ((const bfd_byte *));
 .  bfd_signed_vma (*bfd_h_getx_signed_16) PARAMS ((const bfd_byte *));
 .  void           (*bfd_h_putx16) PARAMS ((bfd_vma, bfd_byte *));

-
-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.
-
+.
+.  {* 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]) PARAMS ((bfd *));
 .  const struct bfd_target *(*_bfd_check_format[bfd_type_end]) PARAMS ((bfd *));

-
-Set the format of a file being written.
-
-.  boolean  (*_bfd_set_format[bfd_type_end]) PARAMS ((bfd *));
-
-Write cached information into a file being written, at <<bfd_close>>.
-
-.  boolean  (*_bfd_write_contents[bfd_type_end]) PARAMS ((bfd *));
-
+.
+.  {* Set the format of a file being written.  *}
+.  bfd_boolean (*_bfd_set_format[bfd_type_end]) PARAMS ((bfd *));
+.
+.  {* Write cached information into a file being written, at <<bfd_close>>.  *}
+.  bfd_boolean (*_bfd_write_contents[bfd_type_end]) PARAMS ((bfd *));
+.

 The general target vector.  These vectors are initialized using the
 BFD_JUMP_TABLE macros.
 The general target vector.  These vectors are initialized using the
 BFD_JUMP_TABLE macros.

-

 .
 .  {* Generic entry points.  *}
 .
 .  {* 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)
+Do not "beautify" the CONCAT* macro args.  Traditional C will not
+remove whitespace added here, and thus will fail to concatenate
+the tokens.
+.#define BFD_JUMP_TABLE_GENERIC(NAME) \
+.CONCAT2 (NAME,_close_and_cleanup), \
+.CONCAT2 (NAME,_bfd_free_cached_info), \
+.CONCAT2 (NAME,_new_section_hook), \
+.CONCAT2 (NAME,_get_section_contents), \
+.CONCAT2 (NAME,_get_section_contents_in_window)

 .
 .  {* Called when the BFD is being closed to do any necessary cleanup.  *}
 .
 .  {* Called when the BFD is being closed to do any necessary cleanup.  *}

-.  boolean  (*_close_and_cleanup) PARAMS ((bfd *));
+.  bfd_boolean (*_close_and_cleanup) PARAMS ((bfd *));

 .  {* Ask the BFD to free all cached information.  *}
 .  {* Ask the BFD to free all cached information.  *}

-.  boolean  (*_bfd_free_cached_info) PARAMS ((bfd *));
+.  bfd_boolean (*_bfd_free_cached_info) PARAMS ((bfd *));

 .  {* Called when a new section is created.  *}
 .  {* Called when a new section is created.  *}

-.  boolean  (*_new_section_hook) PARAMS ((bfd *, sec_ptr));
+.  bfd_boolean (*_new_section_hook) PARAMS ((bfd *, sec_ptr));

 .  {* Read the contents of a section.  *}
 .  {* 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)
+.  bfd_boolean (*_bfd_get_section_contents)
+.    PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
+.  bfd_boolean (*_bfd_get_section_contents_in_window)

 .    PARAMS ((bfd *, sec_ptr, bfd_window *, file_ptr, bfd_size_type));
 .
 .  {* Entry points to copy private data.  *}
 .    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)\
+.#define BFD_JUMP_TABLE_COPY(NAME) \
+.CONCAT2 (NAME,_bfd_copy_private_bfd_data), \
+.CONCAT2 (NAME,_bfd_merge_private_bfd_data), \
+.CONCAT2 (NAME,_bfd_copy_private_section_data), \
+.CONCAT2 (NAME,_bfd_copy_private_symbol_data), \
+.CONCAT2 (NAME,_bfd_set_private_flags), \
+.CONCAT2 (NAME,_bfd_print_private_bfd_data) \

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

-.  boolean  (*_bfd_copy_private_bfd_data) PARAMS ((bfd *, bfd *));
+.  bfd_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.  *}
 .  {* 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 *));
+.  bfd_boolean (*_bfd_merge_private_bfd_data) PARAMS ((bfd *, bfd *));

 .  {* 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.  *}

-.  boolean  (*_bfd_copy_private_section_data) PARAMS ((bfd *, sec_ptr,
-.                                                      bfd *, sec_ptr));
+.  bfd_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.  *}
 .  {* 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));
+.  bfd_boolean (*_bfd_copy_private_symbol_data)
+.    PARAMS ((bfd *, asymbol *, bfd *, asymbol *));
+.  {* Called to set private backend flags.  *}
+.  bfd_boolean (*_bfd_set_private_flags) PARAMS ((bfd *, flagword));

 .
 .

-.  {* Called to print private BFD data *}
-.  boolean  (*_bfd_print_private_bfd_data) PARAMS ((bfd *, PTR));
+.  {* Called to print private BFD data.  *}
+.  bfd_boolean (*_bfd_print_private_bfd_data) PARAMS ((bfd *, PTR));

 .
 .  {* Core file entry points.  *}
 .
 .  {* 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 *));
+.#define BFD_JUMP_TABLE_CORE(NAME) \
+.CONCAT2 (NAME,_core_file_failing_command), \
+.CONCAT2 (NAME,_core_file_failing_signal), \
+.CONCAT2 (NAME,_core_file_matches_executable_p)
+.  char *      (*_core_file_failing_command) PARAMS ((bfd *));
+.  int         (*_core_file_failing_signal) PARAMS ((bfd *));
+.  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_construct_extended_name_table)
+.#define BFD_JUMP_TABLE_ARCHIVE(NAME) \
+.CONCAT2 (NAME,_slurp_armap), \
+.CONCAT2 (NAME,_slurp_extended_name_table), \
+.CONCAT2 (NAME,_construct_extended_name_table), \
+.CONCAT2 (NAME,_truncate_arname), \
+.CONCAT2 (NAME,_write_armap), \
+.CONCAT2 (NAME,_read_ar_hdr), \
+.CONCAT2 (NAME,_openr_next_archived_file), \
+.CONCAT2 (NAME,_get_elt_at_index), \
+.CONCAT2 (NAME,_generic_stat_arch_elt), \
+.CONCAT2 (NAME,_update_armap_timestamp)
+.  bfd_boolean (*_bfd_slurp_armap) PARAMS ((bfd *));
+.  bfd_boolean (*_bfd_slurp_extended_name_table) PARAMS ((bfd *));
+.  bfd_boolean (*_bfd_construct_extended_name_table)

 .    PARAMS ((bfd *, char **, bfd_size_type *, const char **));
 .    PARAMS ((bfd *, char **, bfd_size_type *, const char **));

-.  void     (*_bfd_truncate_arname) PARAMS ((bfd *, const char *, char *));
-.  boolean  (*write_armap)
+.  void        (*_bfd_truncate_arname) PARAMS ((bfd *, const char *, char *));
+.  bfd_boolean (*write_armap)

 .    PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int));
 .    PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int));

-.  PTR      (*_bfd_read_ar_hdr_fn) PARAMS ((bfd *));
-.  bfd *    (*openr_next_archived_file) PARAMS ((bfd *, bfd *));
+.  PTR         (*_bfd_read_ar_hdr_fn) PARAMS ((bfd *));
+.  bfd *       (*openr_next_archived_file) PARAMS ((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) PARAMS ((bfd *, symindex));
-.  int      (*_bfd_stat_arch_elt) PARAMS ((bfd *, struct stat *));
-.  boolean  (*_bfd_update_armap_timestamp) PARAMS ((bfd *));
+.  bfd *       (*_bfd_get_elt_at_index) PARAMS ((bfd *, symindex));
+.  int         (*_bfd_stat_arch_elt) PARAMS ((bfd *, struct stat *));
+.  bfd_boolean (*_bfd_update_armap_timestamp) PARAMS ((bfd *));

 .
 .  {* Entry points used for symbols.  *}
 .
 .  {* 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 *,
+.#define BFD_JUMP_TABLE_SYMBOLS(NAME) \
+.CONCAT2 (NAME,_get_symtab_upper_bound), \
+.CONCAT2 (NAME,_get_symtab), \
+.CONCAT2 (NAME,_make_empty_symbol), \
+.CONCAT2 (NAME,_print_symbol), \
+.CONCAT2 (NAME,_get_symbol_info), \
+.CONCAT2 (NAME,_bfd_is_local_label_name), \
+.CONCAT2 (NAME,_get_lineno), \
+.CONCAT2 (NAME,_find_nearest_line), \
+.CONCAT2 (NAME,_bfd_make_debug_symbol), \
+.CONCAT2 (NAME,_read_minisymbols), \
+.CONCAT2 (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 *
 .                                                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_print_symbol_type));
+.              (*_bfd_make_empty_symbol) PARAMS ((bfd *));
+.  void        (*_bfd_print_symbol)
+.    PARAMS ((bfd *, PTR, struct symbol_cache_entry *, bfd_print_symbol_type));

 .#define bfd_print_symbol(b,p,s,e) BFD_SEND(b, _bfd_print_symbol, (b,p,s,e))
 .#define bfd_print_symbol(b,p,s,e) BFD_SEND(b, _bfd_print_symbol, (b,p,s,e))

-.  void     (*_bfd_get_symbol_info) PARAMS ((bfd *,
-.                                            struct symbol_cache_entry *,
-.                                            symbol_info *));
+.  void        (*_bfd_get_symbol_info)
+.    PARAMS ((bfd *, struct symbol_cache_entry *, symbol_info *));

 .#define bfd_get_symbol_info(b,p,e) BFD_SEND(b, _bfd_get_symbol_info, (b,p,e))
 .#define bfd_get_symbol_info(b,p,e) BFD_SEND(b, _bfd_get_symbol_info, (b,p,e))

-.  boolean  (*_bfd_is_local_label_name) PARAMS ((bfd *, const char *));
+.  bfd_boolean (*_bfd_is_local_label_name) PARAMS ((bfd *, const char *));

 .
 .

-.  alent *  (*_get_lineno) PARAMS ((bfd *, struct symbol_cache_entry *));
-.  boolean  (*_bfd_find_nearest_line)
+.  alent *     (*_get_lineno) PARAMS ((bfd *, struct symbol_cache_entry *));
+.  bfd_boolean (*_bfd_find_nearest_line)

 .    PARAMS ((bfd *, struct sec *, struct symbol_cache_entry **, bfd_vma,
 .             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.  *}
 .    PARAMS ((bfd *, struct sec *, struct symbol_cache_entry **, bfd_vma,
 .             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) PARAMS ((bfd *, void *,
-.                                              unsigned long size));
+.  asymbol *   (*_bfd_make_debug_symbol)
+.    PARAMS ((bfd *, void *, unsigned long size));

 .#define bfd_read_minisymbols(b, d, m, s) \
 .  BFD_SEND (b, _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) PARAMS ((bfd *, boolean, PTR *,
-.                                         unsigned int *));
+.  long        (*_read_minisymbols)
+.    PARAMS ((bfd *, bfd_boolean, PTR *, unsigned int *));

 .#define bfd_minisymbol_to_symbol(b, d, m, f) \
 .  BFD_SEND (b, _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) PARAMS ((bfd *, boolean, const PTR,
-.                                             asymbol *));
+.  asymbol *   (*_minisymbol_to_symbol)
+.    PARAMS ((bfd *, bfd_boolean, const PTR, asymbol *));

 .
 .  {* Routines for relocs.  *}
 .
 .  {* 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 **));
+.#define BFD_JUMP_TABLE_RELOCS(NAME) \
+.CONCAT2 (NAME,_get_reloc_upper_bound), \
+.CONCAT2 (NAME,_canonicalize_reloc), \
+.CONCAT2 (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 *
 .  {* See documentation on reloc types.  *}
 .  reloc_howto_type *

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

 .
 .  {* Routines used when writing an object file.  *}
 .
 .  {* 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));
+.#define BFD_JUMP_TABLE_WRITE(NAME) \
+.CONCAT2 (NAME,_set_arch_mach), \
+.CONCAT2 (NAME,_set_section_contents)
+.  bfd_boolean (*_bfd_set_arch_mach)
+.    PARAMS ((bfd *, enum bfd_architecture, unsigned long));
+.  bfd_boolean (*_bfd_set_section_contents)
+.    PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));

 .
 .  {* Routines used by the linker.  *}
 .
 .  {* 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),\
-.CAT(NAME,_bfd_merge_sections)
-.  int      (*_bfd_sizeof_headers) PARAMS ((bfd *, boolean));
-.  bfd_byte *(*_bfd_get_relocated_section_contents)
+.#define BFD_JUMP_TABLE_LINK(NAME) \
+.CONCAT2 (NAME,_sizeof_headers), \
+.CONCAT2 (NAME,_bfd_get_relocated_section_contents), \
+.CONCAT2 (NAME,_bfd_relax_section), \
+.CONCAT2 (NAME,_bfd_link_hash_table_create), \
+.CONCAT2 (NAME,_bfd_link_hash_table_free), \
+.CONCAT2 (NAME,_bfd_link_add_symbols), \
+.CONCAT2 (NAME,_bfd_link_just_syms), \
+.CONCAT2 (NAME,_bfd_final_link), \
+.CONCAT2 (NAME,_bfd_link_split_section), \
+.CONCAT2 (NAME,_bfd_gc_sections), \
+.CONCAT2 (NAME,_bfd_merge_sections), \
+.CONCAT2 (NAME,_bfd_discard_group)
+.  int         (*_bfd_sizeof_headers) PARAMS ((bfd *, bfd_boolean));
+.  bfd_byte *  (*_bfd_get_relocated_section_contents)

 .    PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
 .    PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,

-.             bfd_byte *, boolean, struct symbol_cache_entry **));
+.             bfd_byte *, bfd_boolean, struct symbol_cache_entry **));

 .
 .

-.  boolean  (*_bfd_relax_section)
-.    PARAMS ((bfd *, struct sec *, struct bfd_link_info *, boolean *));
+.  bfd_boolean (*_bfd_relax_section)
+.    PARAMS ((bfd *, struct sec *, struct bfd_link_info *, bfd_boolean *));

 .
 .  {* Create a hash table for the linker.  Different backends store
 .     different information in this 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) PARAMS ((bfd *));
+.  struct bfd_link_hash_table *
+.              (*_bfd_link_hash_table_create) PARAMS ((bfd *));
+.
+.  {* Release the memory associated with the linker hash table.  *}
+.  void        (*_bfd_link_hash_table_free)
+.    PARAMS ((struct bfd_link_hash_table *));

 .
 .  {* Add symbols from this object file into the hash table.  *}
 .
 .  {* Add symbols from this object file into the hash table.  *}

-.  boolean  (*_bfd_link_add_symbols) PARAMS ((bfd *, struct bfd_link_info *));
+.  bfd_boolean (*_bfd_link_add_symbols)
+.    PARAMS ((bfd *, struct bfd_link_info *));
+.
+.  {* Indicate that we are only retrieving symbol values from this section.  *}
+.  void        (*_bfd_link_just_syms)
+.    PARAMS ((asection *, struct bfd_link_info *));

 .
 .  {* 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.  *}

-.  boolean  (*_bfd_final_link) PARAMS ((bfd *, struct bfd_link_info *));
+.  bfd_boolean (*_bfd_final_link) PARAMS ((bfd *, struct bfd_link_info *));

 .
 .  {* Should this section be split up into smaller pieces during linking.  *}
 .
 .  {* Should this section be split up into smaller pieces during linking.  *}

-.  boolean  (*_bfd_link_split_section) PARAMS ((bfd *, struct sec *));
+.  bfd_boolean (*_bfd_link_split_section) PARAMS ((bfd *, struct sec *));

 .
 .  {* Remove sections that are not referenced from the output.  *}
 .
 .  {* Remove sections that are not referenced from the output.  *}

-.  boolean  (*_bfd_gc_sections) PARAMS ((bfd *, struct bfd_link_info *));
+.  bfd_boolean (*_bfd_gc_sections) PARAMS ((bfd *, struct bfd_link_info *));

 .
 .  {* Attempt to merge SEC_MERGE sections.  *}
 .
 .  {* Attempt to merge SEC_MERGE sections.  *}

-.  boolean  (*_bfd_merge_sections) PARAMS ((bfd *, struct bfd_link_info *));
+.  bfd_boolean (*_bfd_merge_sections) PARAMS ((bfd *, struct bfd_link_info *));
+.
+.  {* Discard members of a group.  *}
+.  bfd_boolean (*_bfd_discard_group) PARAMS ((bfd *, struct sec *));

 .
 .  {* Routines to handle dynamic symbols and relocs.  *}
 .
 .  {* 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 *));
+.#define BFD_JUMP_TABLE_DYNAMIC(NAME) \
+.CONCAT2 (NAME,_get_dynamic_symtab_upper_bound), \
+.CONCAT2 (NAME,_canonicalize_dynamic_symtab), \
+.CONCAT2 (NAME,_get_dynamic_reloc_upper_bound), \
+.CONCAT2 (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.  *}
 .  {* Read in the dynamic symbols.  *}

-.  long     (*_bfd_canonicalize_dynamic_symtab)
+.  long        (*_bfd_canonicalize_dynamic_symtab)

 .    PARAMS ((bfd *, struct symbol_cache_entry **));
 .  {* Get the amount of memory required to hold the dynamic relocs.  *}
 .    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 *));
+.  long        (*_bfd_get_dynamic_reloc_upper_bound) PARAMS ((bfd *));

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

-.  long     (*_bfd_canonicalize_dynamic_reloc)
+.  long        (*_bfd_canonicalize_dynamic_reloc)

 .    PARAMS ((bfd *, arelent **, struct symbol_cache_entry **));
 .
 
 .    PARAMS ((bfd *, arelent **, struct symbol_cache_entry **));
 .
 


@@ -462,17 +469,16 @@ 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.
 
 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;
+.  {* 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;

-
+.

 */
 
 /* All known xvecs (even those that don't compile on all systems).
 */
 
 /* All known xvecs (even those that don't compile on all systems).


@@ -481,6 +487,7 @@ in this structure.
    we can't intermix extern's and initializers.  */
 extern const bfd_target a29kcoff_big_vec;
 extern const bfd_target a_out_adobe_vec;
    we can't intermix extern's and initializers.  */
 extern const bfd_target a29kcoff_big_vec;
 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 aout0_big_vec;
 extern const bfd_target aout_arm_big_vec;
 extern const bfd_target aout_arm_little_vec;


@@ -511,16 +518,22 @@ extern const bfd_target bfd_elf32_bigmips_vec;
 extern const bfd_target bfd_elf32_cris_vec;
 extern const bfd_target bfd_elf32_d10v_vec;
 extern const bfd_target bfd_elf32_d30v_vec;
 extern const bfd_target bfd_elf32_cris_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_fr30_vec;
 extern const bfd_target bfd_elf32_fr30_vec;

+extern const bfd_target bfd_elf32_frv_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_vec;
 extern const bfd_target bfd_elf32_i370_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_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_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_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_little_generic_vec;
 extern const bfd_target bfd_elf32_littlearc_vec;
 extern const bfd_target bfd_elf32_littlearm_oabi_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_oabi_vec;


@@ -535,21 +548,40 @@ extern const bfd_target bfd_elf32_mcore_big_vec;
 extern const bfd_target bfd_elf32_mcore_little_vec;
 extern const bfd_target bfd_elf32_mn10200_vec;
 extern const bfd_target bfd_elf32_mn10300_vec;
 extern const bfd_target bfd_elf32_mcore_little_vec;
 extern const bfd_target bfd_elf32_mn10200_vec;
 extern const bfd_target bfd_elf32_mn10300_vec;

+extern const bfd_target bfd_elf32_msp430_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_openrisc_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_s390_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_s390_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_shblin_vec;
 extern const bfd_target bfd_elf32_shl_vec;
 extern const bfd_target bfd_elf32_shlin_vec;
 extern const bfd_target bfd_elf32_sh_vec;
 extern const bfd_target bfd_elf32_shblin_vec;
 extern const bfd_target bfd_elf32_shl_vec;
 extern const bfd_target bfd_elf32_shlin_vec;

+extern const bfd_target bfd_elf32_shlnbsd_vec;
+extern const bfd_target bfd_elf32_shnbsd_vec;

 extern const bfd_target bfd_elf32_sparc_vec;
 extern const bfd_target bfd_elf32_tradbigmips_vec;
 extern const bfd_target bfd_elf32_tradlittlemips_vec;
 extern const bfd_target bfd_elf32_us_cris_vec;
 extern const bfd_target bfd_elf32_v850_vec;
 extern const bfd_target bfd_elf32_sparc_vec;
 extern const bfd_target bfd_elf32_tradbigmips_vec;
 extern const bfd_target bfd_elf32_tradlittlemips_vec;
 extern const bfd_target bfd_elf32_us_cris_vec;
 extern const bfd_target bfd_elf32_v850_vec;

+extern const bfd_target bfd_elf32_vax_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_alpha_vec;
 extern const bfd_target bfd_elf64_big_generic_vec;
 extern const bfd_target bfd_elf64_bigmips_vec;


@@ -558,16 +590,25 @@ extern const bfd_target bfd_elf64_hppa_vec;
 extern const bfd_target bfd_elf64_ia64_aix_big_vec;
 extern const bfd_target bfd_elf64_ia64_aix_little_vec;
 extern const bfd_target bfd_elf64_ia64_big_vec;
 extern const bfd_target bfd_elf64_ia64_aix_big_vec;
 extern const bfd_target bfd_elf64_ia64_aix_little_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_little_generic_vec;
 extern const bfd_target bfd_elf64_littlemips_vec;
 extern const bfd_target bfd_elf64_ia64_little_vec;
 extern const bfd_target bfd_elf64_little_generic_vec;
 extern const bfd_target bfd_elf64_littlemips_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_s390_vec;
 extern const bfd_target bfd_elf64_powerpc_vec;
 extern const bfd_target bfd_elf64_powerpcle_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_tradbigmips_vec;
 extern const bfd_target bfd_elf64_tradlittlemips_vec;
 extern const bfd_target bfd_elf64_x86_64_vec;
 extern const bfd_target bfd_elf64_sparc_vec;
 extern const bfd_target bfd_elf64_tradbigmips_vec;
 extern const bfd_target bfd_elf64_tradlittlemips_vec;
 extern const bfd_target bfd_elf64_x86_64_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_powerpc_pe_vec;
 extern const bfd_target bfd_powerpc_pei_vec;
 extern const bfd_target bfd_powerpcle_pe_vec;


@@ -614,6 +655,9 @@ 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 m68ksysvcoff_vec;
 extern const bfd_target m88kbcs_vec;
 extern const bfd_target m88kmach3_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 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_pe_big_vec;
 extern const bfd_target mcore_pe_little_vec;
 extern const bfd_target mcore_pei_big_vec;


@@ -626,9 +670,12 @@ 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 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 pdp11_aout_vec;
 extern const bfd_target pc532machaout_vec;
 extern const bfd_target pc532netbsd_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 pmac_xcoff_vec;
 extern const bfd_target ppcboot_vec;
 extern const bfd_target riscix_vec;
 extern const bfd_target pmac_xcoff_vec;
 extern const bfd_target ppcboot_vec;
 extern const bfd_target riscix_vec;


@@ -648,8 +695,15 @@ 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 sparclynx_coff_vec;
 extern const bfd_target sparcnetbsd_vec;
 extern const bfd_target sunos_big_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 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_coff1_beh_vec;
+extern const bfd_target tic4x_coff1_vec;
+extern const bfd_target tic4x_coff2_beh_vec;
+extern const bfd_target tic4x_coff2_vec;

 extern const bfd_target tic54x_coff0_beh_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_coff0_vec;
 extern const bfd_target tic54x_coff1_beh_vec;


@@ -657,7 +711,9 @@ extern const bfd_target tic54x_coff1_vec;
 extern const bfd_target tic54x_coff2_beh_vec;
 extern const bfd_target tic54x_coff2_vec;
 extern const bfd_target tic80coff_vec;
 extern const bfd_target tic54x_coff2_beh_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 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_vax_vec;
 extern const bfd_target versados_vec;
 extern const bfd_target vms_alpha_vec;
 extern const bfd_target vms_vax_vec;


@@ -704,9 +760,12 @@ static const bfd_target * const _bfd_target_vector[] = {
           it wasn't omitted by mistake.  */
        &a29kcoff_big_vec,
        &a_out_adobe_vec,
           it wasn't omitted by mistake.  */
        &a29kcoff_big_vec,
        &a_out_adobe_vec,

+#ifdef BFD64
+       &aix5coff64_vec,
+#endif

        &aout0_big_vec,
 #if 0
        &aout0_big_vec,
 #if 0

-       /* We have no way of distinguishing these from other a.out variants */
+       /* 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_arm_big_vec,
        &aout_arm_little_vec,
        /* No one seems to use this.  */


@@ -747,10 +806,14 @@ static const bfd_target * const _bfd_target_vector[] = {
        &bfd_elf32_cris_vec,
        &bfd_elf32_d10v_vec,
        &bfd_elf32_d30v_vec,
        &bfd_elf32_cris_vec,
        &bfd_elf32_d10v_vec,
        &bfd_elf32_d30v_vec,

+       &bfd_elf32_dlx_big_vec,

        &bfd_elf32_fr30_vec,
        &bfd_elf32_fr30_vec,

+       &bfd_elf32_frv_vec,
+       &bfd_elf32_h8300_vec,

        &bfd_elf32_hppa_linux_vec,
        &bfd_elf32_hppa_vec,
        &bfd_elf32_i370_vec,
        &bfd_elf32_hppa_linux_vec,
        &bfd_elf32_hppa_vec,
        &bfd_elf32_i370_vec,

+       &bfd_elf32_i386_freebsd_vec,

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


@@ -758,6 +821,9 @@ static const bfd_target * const _bfd_target_vector[] = {
 #if 0
        &bfd_elf32_ia64_big_vec,
 #endif
 #if 0
        &bfd_elf32_ia64_big_vec,
 #endif

+       &bfd_elf32_ia64_hpux_big_vec,
+       &bfd_elf32_ip2k_vec,
+       &bfd_elf32_iq2000_vec,

        &bfd_elf32_little_generic_vec,
        &bfd_elf32_littlearc_vec,
        &bfd_elf32_littlearm_oabi_vec,
        &bfd_elf32_little_generic_vec,
        &bfd_elf32_littlearc_vec,
        &bfd_elf32_littlearm_oabi_vec,


@@ -772,7 +838,15 @@ static const bfd_target * const _bfd_target_vector[] = {
        &bfd_elf32_mcore_little_vec,
        &bfd_elf32_mn10200_vec,
        &bfd_elf32_mn10300_vec,
        &bfd_elf32_mcore_little_vec,
        &bfd_elf32_mn10200_vec,
        &bfd_elf32_mn10300_vec,

+       &bfd_elf32_msp430_vec,
+#ifdef BFD64
+       &bfd_elf32_nbigmips_vec,
+       &bfd_elf32_nlittlemips_vec,
+       &bfd_elf32_ntradbigmips_vec,
+       &bfd_elf32_ntradlittlemips_vec,
+#endif

        &bfd_elf32_openrisc_vec,
        &bfd_elf32_openrisc_vec,

+       &bfd_elf32_or32_big_vec,

        &bfd_elf32_pj_vec,
        &bfd_elf32_pjl_vec,
        &bfd_elf32_powerpc_vec,
        &bfd_elf32_pj_vec,
        &bfd_elf32_pjl_vec,
        &bfd_elf32_powerpc_vec,


@@ -782,12 +856,27 @@ static const bfd_target * const _bfd_target_vector[] = {
         &bfd_elf32_shblin_vec,
         &bfd_elf32_shl_vec,
         &bfd_elf32_shlin_vec,
         &bfd_elf32_shblin_vec,
         &bfd_elf32_shl_vec,
         &bfd_elf32_shlin_vec,

+       &bfd_elf32_shlnbsd_vec,
+       &bfd_elf32_shnbsd_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_tradbigmips_vec,
        &bfd_elf32_tradlittlemips_vec,
        &bfd_elf32_us_cris_vec,
        &bfd_elf32_v850_vec,
        &bfd_elf32_sparc_vec,
        &bfd_elf32_tradbigmips_vec,
        &bfd_elf32_tradlittlemips_vec,
        &bfd_elf32_us_cris_vec,
        &bfd_elf32_v850_vec,

+       &bfd_elf32_vax_vec,
+       &bfd_elf32_xstormy16_vec,
+       &bfd_elf32_xtensa_be_vec,
+       &bfd_elf32_xtensa_le_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_alpha_vec,
        &bfd_elf64_big_generic_vec,
        &bfd_elf64_bigmips_vec,


@@ -796,18 +885,27 @@ static const bfd_target * const _bfd_target_vector[] = {
        &bfd_elf64_ia64_aix_big_vec,
        &bfd_elf64_ia64_aix_little_vec,
        &bfd_elf64_ia64_big_vec,
        &bfd_elf64_ia64_aix_big_vec,
        &bfd_elf64_ia64_aix_little_vec,
        &bfd_elf64_ia64_big_vec,

+       &bfd_elf64_ia64_hpux_big_vec,

        &bfd_elf64_ia64_little_vec,
        &bfd_elf64_little_generic_vec,
        &bfd_elf64_littlemips_vec,
        &bfd_elf64_ia64_little_vec,
        &bfd_elf64_little_generic_vec,
        &bfd_elf64_littlemips_vec,

+       &bfd_elf64_mmix_vec,

        &bfd_elf64_powerpc_vec,
        &bfd_elf64_powerpcle_vec,
        &bfd_elf64_s390_vec,
        &bfd_elf64_powerpc_vec,
        &bfd_elf64_powerpcle_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,

 #if 0
        &bfd_elf64_sparc_vec,
 #endif
        &bfd_elf64_tradbigmips_vec,
        &bfd_elf64_tradlittlemips_vec,
        &bfd_elf64_x86_64_vec,
 #if 0
        &bfd_elf64_sparc_vec,
 #endif
        &bfd_elf64_tradbigmips_vec,
        &bfd_elf64_tradlittlemips_vec,
        &bfd_elf64_x86_64_vec,

+       &bfd_mmo_vec, 

 #endif
        &bfd_powerpc_pe_vec,
        &bfd_powerpc_pei_vec,
 #endif
        &bfd_powerpc_pe_vec,
        &bfd_powerpc_pei_vec,


@@ -815,7 +913,7 @@ static const bfd_target * const _bfd_target_vector[] = {
        &bfd_powerpcle_pei_vec,
        &cris_aout_vec,
 #ifdef BFD64
        &bfd_powerpcle_pei_vec,
        &cris_aout_vec,
 #ifdef BFD64

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

 #endif
        &ecoff_big_vec,
        &ecoff_biglittle_vec,
 #endif
        &ecoff_big_vec,
        &ecoff_biglittle_vec,


@@ -879,6 +977,9 @@ static const bfd_target * const _bfd_target_vector[] = {
        &m68ksysvcoff_vec,
        &m88kbcs_vec,
        &m88kmach3_vec,
        &m68ksysvcoff_vec,
        &m88kbcs_vec,
        &m88kmach3_vec,

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

        &mcore_pe_big_vec,
        &mcore_pe_little_vec,
        &mcore_pei_big_vec,
        &mcore_pe_big_vec,
        &mcore_pe_little_vec,
        &mcore_pei_big_vec,


@@ -900,16 +1001,21 @@ static const bfd_target * const _bfd_target_vector[] = {
           can be annoying target mis-matches.  */
        &oasys_vec,
 #endif
           can be annoying target mis-matches.  */
        &oasys_vec,
 #endif

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

        &pc532machaout_vec,
        &pc532netbsd_vec,
        &pdp11_aout_vec,
        &pc532machaout_vec,
        &pc532netbsd_vec,
        &pdp11_aout_vec,

+       &pef_vec,
+       &pef_xlib_vec,

 #if 0
        /* This has the same magic number as RS/6000.  */
        &pmac_xcoff_vec,
 #endif
        &ppcboot_vec,
 #if 0
 #if 0
        /* This has the same magic number as RS/6000.  */
        &pmac_xcoff_vec,
 #endif
        &ppcboot_vec,
 #if 0

-       /* We have no way of distinguishing these from other a.out variants */
+       /* We have no way of distinguishing these from other a.out variants.  */

        &riscix_vec,
 #endif
 #ifdef BFD64
        &riscix_vec,
 #endif
 #ifdef BFD64


@@ -932,6 +1038,7 @@ static const bfd_target * const _bfd_target_vector[] = {
        &sparclynx_coff_vec,
        &sparcnetbsd_vec,
        &sunos_big_vec,
        &sparclynx_coff_vec,
        &sparcnetbsd_vec,
        &sunos_big_vec,

+       &sym_vec,

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


@@ -941,7 +1048,9 @@ static const bfd_target * const _bfd_target_vector[] = {
        &tic54x_coff2_beh_vec,
        &tic54x_coff2_vec,
        &tic80coff_vec,
        &tic54x_coff2_beh_vec,
        &tic54x_coff2_vec,
        &tic80coff_vec,

+       &vaxbsd_vec,

        &vaxnetbsd_vec,
        &vaxnetbsd_vec,

+       &vax1knetbsd_vec,

        &versados_vec,
 #ifdef BFD64
        &vms_alpha_vec,
        &versados_vec,
 #ifdef BFD64
        &vms_alpha_vec,


@@ -1013,6 +1122,17 @@ const bfd_target *bfd_default_vector[] = {
        NULL
 };
 
        NULL
 };
 

+/* bfd_associated_vector[] contains the associated target vectors used
+   to reduce the ambiguity in bfd_check_format_matches.  */
+
+static const bfd_target *_bfd_associated_vector[] = {
+#ifdef ASSOCIATED_VECS
+       ASSOCIATED_VECS,
+#endif
+       NULL
+};
+const bfd_target * const *bfd_associated_vector = _bfd_associated_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.  */


@@ -1074,7 +1194,7 @@ FUNCTION
        bfd_set_default_target
 
 SYNOPSIS
        bfd_set_default_target
 
 SYNOPSIS

-       boolean bfd_set_default_target (const char *name);
+       bfd_boolean bfd_set_default_target (const char *name);

 
 DESCRIPTION
        Set the default target vector to use when recognizing a BFD.
 
 DESCRIPTION
        Set the default target vector to use when recognizing a BFD.


@@ -1082,7 +1202,7 @@ DESCRIPTION
        name or a configuration triplet.
 */
 
        name or a configuration triplet.
 */
 

-boolean
+bfd_boolean

 bfd_set_default_target (name)
      const char *name;
 {
 bfd_set_default_target (name)
      const char *name;
 {


@@ -1090,14 +1210,14 @@ bfd_set_default_target (name)
 
   if (bfd_default_vector[0] != NULL
       && strcmp (name, bfd_default_vector[0]->name) == 0)
 
   if (bfd_default_vector[0] != NULL
       && strcmp (name, bfd_default_vector[0]->name) == 0)

-    return true;
+    return TRUE;

 
   target = find_target (name);
   if (target == NULL)
 
   target = find_target (name);
   if (target == NULL)

-    return false;
+    return FALSE;

 
   bfd_default_vector[0] = target;
 
   bfd_default_vector[0] = target;

-  return true;
+  return TRUE;

 }
 
 /*
 }
 
 /*


@@ -1105,7 +1225,7 @@ FUNCTION
        bfd_find_target
 
 SYNOPSIS
        bfd_find_target
 
 SYNOPSIS

-       const 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


@@ -1132,10 +1252,10 @@ bfd_find_target (target_name, abfd)
   else
     targname = getenv ("GNUTARGET");
 
   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") == 0)
     {
   if (targname == NULL || strcmp (targname, "default") == 0)
     {

-      abfd->target_defaulted = true;
+      abfd->target_defaulted = TRUE;

       if (bfd_default_vector[0] != NULL)
        abfd->xvec = bfd_default_vector[0];
       else
       if (bfd_default_vector[0] != NULL)
        abfd->xvec = bfd_default_vector[0];
       else


@@ -1143,7 +1263,7 @@ bfd_find_target (target_name, abfd)
       return abfd->xvec;
     }
 
       return abfd->xvec;
     }
 

-  abfd->target_defaulted = false;
+  abfd->target_defaulted = FALSE;

 
   target = find_target (targname);
   if (target == NULL)
 
   target = find_target (targname);
   if (target == NULL)


@@ -1158,7 +1278,7 @@ FUNCTION
        bfd_target_list
 
 SYNOPSIS
        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


@@ -1184,14 +1304,17 @@ bfd_target_list ()
     vec_length++;
 
   amt = (vec_length + 1) * sizeof (char **);
     vec_length++;
 
   amt = (vec_length + 1) * sizeof (char **);

-  name_ptr = name_list = (const char **) bfd_zmalloc (amt);
+  name_ptr = name_list = (const char **) bfd_malloc (amt);

 
   if (name_list == NULL)
     return NULL;
 
   for (target = &bfd_target_vector[0]; *target != NULL; target++)
 
   if (name_list == NULL)
     return NULL;
 
   for (target = &bfd_target_vector[0]; *target != NULL; target++)

-    *(name_ptr++) = (*target)->name;
+    if (target == &bfd_target_vector[0]
+       || *target != bfd_target_vector[0])
+      *name_ptr++ = (*target)->name;

 
 

+  *name_ptr = NULL;

   return name_list;
 }
 
   return name_list;
 }
 


@@ -1200,7 +1323,9 @@ FUNCTION
        bfd_seach_for_target
 
 SYNOPSIS
        bfd_seach_for_target
 
 SYNOPSIS

-       const bfd_target * bfd_search_for_target (int (* search_func) (const bfd_target *, void *), void *);
+       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
 
 DESCRIPTION
        Return a pointer to the first transfer vector in the list of