binutils ChangeLog:

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

diff --git a/bfd/targets.c b/bfd/targets.c
index b92a1c3cee66af6b24d8c468842a3260eb7435bd..bceb724e22def83a3f069889967d02e1fe47036b 100644 (file)
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -1,23 +1,24 @@
 /* Generic target-file-type support for the BFD library.
 /* Generic target-file-type support for the BFD library.

-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003, 2004

    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"


@@ -25,16 +26,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "fnmatch.h"
 
 /*
 #include "fnmatch.h"
 
 /*

-SECTION 
+SECTION

        Targets
 
 DESCRIPTION
        Targets
 
 DESCRIPTION

-       Each port of BFD to a different machine requries the creation
+       Each port of BFD to a different machine requires the creation

        of a target back end. All the back end provides to the root
        part of BFD is a structure containing pointers to functions
        which perform certain low level operations on files. BFD
        translates the applications's requests through a pointer into
        of a target back end. All the back end provides to the root
        part of BFD is a structure containing pointers to functions
        which perform certain low level operations on files. BFD
        translates the applications's requests through a pointer into

-       calls to the back end routines. 
+       calls to the back end routines.

 
        When a file is opened with <<bfd_openr>>, its format and
        target are unknown. BFD uses various mechanisms to determine
 
        When a file is opened with <<bfd_openr>>, its format and
        target are unknown. BFD uses various mechanisms to determine


@@ -42,11 +43,11 @@ DESCRIPTION
 
        o Create a BFD by calling the internal routine
        <<_bfd_new_bfd>>, then call <<bfd_find_target>> with the
 
        o Create a BFD by calling the internal routine
        <<_bfd_new_bfd>>, then call <<bfd_find_target>> with the

-       target string supplied to <<bfd_openr>> and the new BFD pointer. 
+       target string supplied to <<bfd_openr>> and the new BFD pointer.

 
        o If a null target string was provided to <<bfd_find_target>>,
        look up the environment variable <<GNUTARGET>> and use
 
        o If a null target string was provided to <<bfd_find_target>>,
        look up the environment variable <<GNUTARGET>> and use

-       that as the target string. 
+       that as the target string.

 
        o If the target string is still <<NULL>>, or the target string is
        <<default>>, then use the first item in the target vector
 
        o If the target string is still <<NULL>>, or the target string is
        <<default>>, then use the first item in the target vector


@@ -56,7 +57,7 @@ DESCRIPTION
 
        o Otherwise, inspect the elements in the target vector
        one by one, until a match on target name is found. When found,
 
        o Otherwise, inspect the elements in the target vector
        one by one, until a match on target name is found. When found,

-       use it. 
+       use it.

 
        o Otherwise return the error <<bfd_error_invalid_target>> to
        <<bfd_openr>>.
 
        o Otherwise return the error <<bfd_error_invalid_target>> to
        <<bfd_openr>>.


@@ -66,16 +67,15 @@ DESCRIPTION
 
        Once the BFD has been opened and the target selected, the file
        format may be determined. This is done by calling
 
        Once the BFD has been opened and the target selected, the file
        format may be determined. This is done by calling

-       <<bfd_check_format>> on the BFD with a suggested 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.
        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
 */
 

-

 /*
 
 INODE
 /*
 
 INODE


@@ -87,23 +87,23 @@ SUBSECTION
 DESCRIPTION
        This structure contains everything that BFD knows about a
        target. It includes things like its byte order, name, and which
 DESCRIPTION
        This structure contains everything that BFD knows about a
        target. It includes things like its byte order, name, and which

-       routines to call to do various operations.   
+       routines to call to do various operations.

 
        Every BFD points to a target structure with its <<xvec>>
 
        Every BFD points to a target structure with its <<xvec>>

-       member. 
+       member.

 
        The macros below are used to dispatch to functions through the
        <<bfd_target>> vector. They are used in a number of macros further
        down in @file{bfd.h}, and are also used when calling various
        routines by hand inside the BFD implementation.  The @var{arglist}
        argument must be parenthesized; it contains all the arguments
 
        The macros below are used to dispatch to functions through the
        <<bfd_target>> vector. They are used in a number of macros further
        down in @file{bfd.h}, and are also used when calling various
        routines by hand inside the BFD implementation.  The @var{arglist}
        argument must be parenthesized; it contains all the arguments

-       to the called function. 
+       to the called function.

 
        They make the documentation (more) unpleasant to read, so if
        someone wants to fix this and not break the above, please do.
 
 .#define BFD_SEND(bfd, message, arglist) \
 
        They make the documentation (more) unpleasant to read, so if
        someone wants to fix this and not break the above, please do.
 
 .#define BFD_SEND(bfd, message, arglist) \

-.               ((*((bfd)->xvec->message)) arglist)
+.  ((*((bfd)->xvec->message)) arglist)

 .
 .#ifdef DEBUG_BFD_SEND
 .#undef BFD_SEND
 .
 .#ifdef DEBUG_BFD_SEND
 .#undef BFD_SEND


@@ -116,31 +116,32 @@ DESCRIPTION
        For operations which index on the BFD format:
 
 .#define BFD_SEND_FMT(bfd, message, arglist) \
        For operations which index on the BFD format:
 
 .#define BFD_SEND_FMT(bfd, message, arglist) \

-.            (((bfd)->xvec->message[(int)((bfd)->format)]) 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) ? \
 .
 .#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)->xvec->message[(int) ((bfd)->format)]) arglist) : \

 .   (bfd_assert (__FILE__,__LINE__), NULL))
 .#endif
 .   (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,
        defines one of these.
 
        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,
        defines one of these.
 

-

        FIXME, these names should be rationalised with the names of
        the entry points which call them. Too bad we can't have one
        FIXME, these names should be rationalised with the names of
        the entry points which call them. Too bad we can't have one

-       macro to define them both! 
+       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_ecoff_flavour,
 .  bfd_target_unknown_flavour,
 .  bfd_target_aout_flavour,
 .  bfd_target_coff_flavour,
 .  bfd_target_ecoff_flavour,

+.  bfd_target_xcoff_flavour,

 .  bfd_target_elf_flavour,
 .  bfd_target_ieee_flavour,
 .  bfd_target_nlm_flavour,
 .  bfd_target_elf_flavour,
 .  bfd_target_ieee_flavour,
 .  bfd_target_nlm_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,302 +169,313 @@ 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>>.
-
-.  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 an executable may have set -
+.     from the set <<BFD_NO_FLAGS>>, <<HAS_RELOC>>, ...<<D_PAGED>>.  *}
+.  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>>.  *}

 .  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.
-
-.  char ar_pad_char;            
-
-The maximum number of characters in an archive header.
-
+.
+. {* The pad character for file names within an archive header.  *}
+.  char ar_pad_char;
+.
+.  {* 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.
-
-.  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_getx32) PARAMS ((const bfd_byte *));
-.  bfd_signed_vma (*bfd_getx_signed_32) PARAMS ((const bfd_byte *));
-.  void         (*bfd_putx32) 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
-
-.  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_getx32) PARAMS ((const bfd_byte *));
-.  bfd_signed_vma (*bfd_h_getx_signed_32) PARAMS ((const bfd_byte *));
-.  void         (*bfd_h_putx32) 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. 
-
-.  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 *));
-
+.
+.  {* 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_uint64_t   (*bfd_getx64) (const void *);
+.  bfd_int64_t    (*bfd_getx_signed_64) (const void *);
+.  void           (*bfd_putx64) (bfd_uint64_t, void *);
+.  bfd_vma        (*bfd_getx32) (const void *);
+.  bfd_signed_vma (*bfd_getx_signed_32) (const void *);
+.  void           (*bfd_putx32) (bfd_vma, void *);
+.  bfd_vma        (*bfd_getx16) (const void *);
+.  bfd_signed_vma (*bfd_getx_signed_16) (const void *);
+.  void           (*bfd_putx16) (bfd_vma, void *);
+.
+.  {* Byte swapping for the headers.  *}
+.  bfd_uint64_t   (*bfd_h_getx64) (const void *);
+.  bfd_int64_t    (*bfd_h_getx_signed_64) (const void *);
+.  void           (*bfd_h_putx64) (bfd_uint64_t, void *);
+.  bfd_vma        (*bfd_h_getx32) (const void *);
+.  bfd_signed_vma (*bfd_h_getx_signed_32) (const void *);
+.  void           (*bfd_h_putx32) (bfd_vma, void *);
+.  bfd_vma        (*bfd_h_getx16) (const void *);
+.  bfd_signed_vma (*bfd_h_getx_signed_16) (const void *);
+.  void           (*bfd_h_putx16) (bfd_vma, void *);
+.
+.  {* Format dependent routines: these are vectors of entry points
+.     within the target vector structure, one for each format to check.  *}
+.
+.  {* Check the format of a file being read.  Return a <<bfd_target *>> or zero.  *}
+.  const struct bfd_target *(*_bfd_check_format[bfd_type_end]) (bfd *);
+.
+.  {* Set the format of a file being written.  *}
+.  bfd_boolean (*_bfd_set_format[bfd_type_end]) (bfd *);
+.
+.  {* Write cached information into a file being written, at <<bfd_close>>.  *}
+.  bfd_boolean (*_bfd_write_contents[bfd_type_end]) (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)
+.#define BFD_JUMP_TABLE_GENERIC(NAME) \
+.  NAME##_close_and_cleanup, \
+.  NAME##_bfd_free_cached_info, \
+.  NAME##_new_section_hook, \
+.  NAME##_get_section_contents, \
+.  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) (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) (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) (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)
-.                          PARAMS ((bfd *, sec_ptr, bfd_window *,
-.                                   file_ptr, bfd_size_type));
+.  bfd_boolean (*_bfd_get_section_contents)
+.    (bfd *, sec_ptr, void *, file_ptr, bfd_size_type);
+.  bfd_boolean (*_bfd_get_section_contents_in_window)
+.    (bfd *, sec_ptr, bfd_window *, file_ptr, bfd_size_type);

 .
 .  {* Entry points to copy private data.  *}
 .
 .  {* 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) \
+.  NAME##_bfd_copy_private_bfd_data, \
+.  NAME##_bfd_merge_private_bfd_data, \
+.  NAME##_bfd_copy_private_section_data, \
+.  NAME##_bfd_copy_private_symbol_data, \
+.  NAME##_bfd_copy_private_header_data, \
+.  NAME##_bfd_set_private_flags, \
+.  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) (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) (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));
-.  {* Called to copy BFD private symbol data from one symbol 
+.  bfd_boolean (*_bfd_copy_private_section_data)
+.    (bfd *, sec_ptr, bfd *, sec_ptr);
+.  {* Called to copy BFD private symbol data from one symbol
+.     to another.  *}
+.  bfd_boolean (*_bfd_copy_private_symbol_data)
+.    (bfd *, asymbol *, bfd *, asymbol *);
+.  {* Called to copy BFD private header data from one object file

 .     to another.  *}
 .     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_header_data)
+.    (bfd *, bfd *);
+.  {* Called to set private backend flags.  *}
+.  bfd_boolean (*_bfd_set_private_flags) (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) (bfd *, void *);

 .
 .  {* 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) \
+.  NAME##_core_file_failing_command, \
+.  NAME##_core_file_failing_signal, \
+.  NAME##_core_file_matches_executable_p
+.
+.  char *      (*_core_file_failing_command) (bfd *);
+.  int         (*_core_file_failing_signal) (bfd *);
+.  bfd_boolean (*_core_file_matches_executable_p) (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)
-.             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));
-.  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 *));
+.#define BFD_JUMP_TABLE_ARCHIVE(NAME) \
+.  NAME##_slurp_armap, \
+.  NAME##_slurp_extended_name_table, \
+.  NAME##_construct_extended_name_table, \
+.  NAME##_truncate_arname, \
+.  NAME##_write_armap, \
+.  NAME##_read_ar_hdr, \
+.  NAME##_openr_next_archived_file, \
+.  NAME##_get_elt_at_index, \
+.  NAME##_generic_stat_arch_elt, \
+.  NAME##_update_armap_timestamp
+.
+.  bfd_boolean (*_bfd_slurp_armap) (bfd *);
+.  bfd_boolean (*_bfd_slurp_extended_name_table) (bfd *);
+.  bfd_boolean (*_bfd_construct_extended_name_table)
+.    (bfd *, char **, bfd_size_type *, const char **);
+.  void        (*_bfd_truncate_arname) (bfd *, const char *, char *);
+.  bfd_boolean (*write_armap)
+.    (bfd *, unsigned int, struct orl *, unsigned int, int);
+.  void *      (*_bfd_read_ar_hdr_fn) (bfd *);
+.  bfd *       (*openr_next_archived_file) (bfd *, bfd *);
+.#define bfd_get_elt_at_index(b,i) BFD_SEND (b, _bfd_get_elt_at_index, (b,i))
+.  bfd *       (*_bfd_get_elt_at_index) (bfd *, symindex);
+.  int         (*_bfd_stat_arch_elt) (bfd *, struct stat *);
+.  bfd_boolean (*_bfd_update_armap_timestamp) (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 *,
-.                                             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));
-.#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 *));
-.#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 *));
+.#define BFD_JUMP_TABLE_SYMBOLS(NAME) \
+.  NAME##_get_symtab_upper_bound, \
+.  NAME##_canonicalize_symtab, \
+.  NAME##_make_empty_symbol, \
+.  NAME##_print_symbol, \
+.  NAME##_get_symbol_info, \
+.  NAME##_bfd_is_local_label_name, \
+.  NAME##_get_lineno, \
+.  NAME##_find_nearest_line, \
+.  NAME##_bfd_make_debug_symbol, \
+.  NAME##_read_minisymbols, \
+.  NAME##_minisymbol_to_symbol
+.
+.  long        (*_bfd_get_symtab_upper_bound) (bfd *);
+.  long        (*_bfd_canonicalize_symtab)
+.    (bfd *, struct bfd_symbol **);
+.  struct bfd_symbol *
+.              (*_bfd_make_empty_symbol) (bfd *);
+.  void        (*_bfd_print_symbol)
+.    (bfd *, void *, struct bfd_symbol *, bfd_print_symbol_type);
+.#define bfd_print_symbol(b,p,s,e) BFD_SEND (b, _bfd_print_symbol, (b,p,s,e))
+.  void        (*_bfd_get_symbol_info)
+.    (bfd *, struct bfd_symbol *, symbol_info *);
+.#define bfd_get_symbol_info(b,p,e) BFD_SEND (b, _bfd_get_symbol_info, (b,p,e))
+.  bfd_boolean (*_bfd_is_local_label_name) (bfd *, const char *);

 .
 .

-.  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));
+.  alent *     (*_get_lineno) (bfd *, struct bfd_symbol *);
+.  bfd_boolean (*_bfd_find_nearest_line)
+.    (bfd *, struct bfd_section *, struct bfd_symbol **, bfd_vma,
+.     const char **, const char **, unsigned int *);

 . {* 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.  *}
 . {* 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));
+.  asymbol *   (*_bfd_make_debug_symbol)
+.    (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)
+.    (bfd *, bfd_boolean, void **, 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)
+.    (bfd *, bfd_boolean, const void *, 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) \
+.  NAME##_get_reloc_upper_bound, \
+.  NAME##_canonicalize_reloc, \
+.  NAME##_bfd_reloc_type_lookup
+.
+.  long        (*_get_reloc_upper_bound) (bfd *, sec_ptr);
+.  long        (*_bfd_canonicalize_reloc)
+.    (bfd *, sec_ptr, arelent **, struct bfd_symbol **);

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

-.       (*reloc_type_lookup) PARAMS ((bfd *abfd,
-.                                     bfd_reloc_code_real_type code));
+.              (*reloc_type_lookup) (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) \
+.  NAME##_set_arch_mach, \
+.  NAME##_set_section_contents
+.
+.  bfd_boolean (*_bfd_set_arch_mach)
+.    (bfd *, enum bfd_architecture, unsigned long);
+.  bfd_boolean (*_bfd_set_section_contents)
+.    (bfd *, sec_ptr, const void *, file_ptr, bfd_size_type);

 .
 .  {* 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)
-.  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 **));
+.#define BFD_JUMP_TABLE_LINK(NAME) \
+.  NAME##_sizeof_headers, \
+.  NAME##_bfd_get_relocated_section_contents, \
+.  NAME##_bfd_relax_section, \
+.  NAME##_bfd_link_hash_table_create, \
+.  NAME##_bfd_link_hash_table_free, \
+.  NAME##_bfd_link_add_symbols, \
+.  NAME##_bfd_link_just_syms, \
+.  NAME##_bfd_final_link, \
+.  NAME##_bfd_link_split_section, \
+.  NAME##_bfd_gc_sections, \
+.  NAME##_bfd_merge_sections, \
+.  NAME##_bfd_is_group_section, \
+.  NAME##_bfd_discard_group
+.
+.  int         (*_bfd_sizeof_headers) (bfd *, bfd_boolean);
+.  bfd_byte *  (*_bfd_get_relocated_section_contents)
+.    (bfd *, struct bfd_link_info *, struct bfd_link_order *,
+.     bfd_byte *, bfd_boolean, struct bfd_symbol **);

 .
 .

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

 .
 .  {* Create a hash table for the linker.  Different backends store
 .     different information in this table.  *}
 .
 .  {* 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) (bfd *);
+.
+.  {* Release the memory associated with the linker hash table.  *}
+.  void        (*_bfd_link_hash_table_free) (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) (bfd *, struct bfd_link_info *);
+.
+.  {* Indicate that we are only retrieving symbol values from this section.  *}
+.  void        (*_bfd_link_just_syms) (asection *, struct bfd_link_info *);

 .
 .  {* 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) (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) (bfd *, struct bfd_section *);

 .
 .  {* 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) (bfd *, struct bfd_link_info *);
+.
+.  {* Attempt to merge SEC_MERGE sections.  *}
+.  bfd_boolean (*_bfd_merge_sections) (bfd *, struct bfd_link_info *);
+.
+.  {* Is this section a member of a group?  *}
+.  bfd_boolean (*_bfd_is_group_section) (bfd *, const struct bfd_section *);
+.
+.  {* Discard members of a group.  *}
+.  bfd_boolean (*_bfd_discard_group) (bfd *, struct bfd_section *);

 .
 .  {* 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) \
+.  NAME##_get_dynamic_symtab_upper_bound, \
+.  NAME##_canonicalize_dynamic_symtab, \
+.  NAME##_get_synthetic_symtab, \
+.  NAME##_get_dynamic_reloc_upper_bound, \
+.  NAME##_canonicalize_dynamic_reloc
+.
+.  {* Get the amount of memory required to hold the dynamic symbols.  *}
+.  long        (*_bfd_get_dynamic_symtab_upper_bound) (bfd *);

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

-.  long  (*_bfd_canonicalize_dynamic_symtab)
-.    PARAMS ((bfd *, struct symbol_cache_entry **));
+.  long        (*_bfd_canonicalize_dynamic_symtab)
+.    (bfd *, struct bfd_symbol **);
+.  {* Create synthetized symbols.  *}
+.  long        (*_bfd_get_synthetic_symtab)
+.    (bfd *, struct bfd_symbol **, struct bfd_symbol **);

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

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

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

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

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


@@ -467,17 +484,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;
-. 
-
-Data for use by back-end routines, which isn't generic enough to belong
-in this structure.
+.  {* Opposite endian version of this target.  *}
+.  const struct bfd_target * alternative_target;
+.

 
 

-. PTR backend_data;
-. 
+.  {* Data for use by back-end routines, which isn't
+.     generic enough to belong in this structure.  *}
+.  const void *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).


@@ -486,104 +502,167 @@ 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 aout_mips_big_vec;
 extern const bfd_target aout_mips_little_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 apollocoff_vec;

-extern const bfd_target armcoff_little_vec;
+extern const bfd_target arm_epoc_pe_big_vec;
+extern const bfd_target arm_epoc_pe_little_vec;
+extern const bfd_target arm_epoc_pei_big_vec;
+extern const bfd_target arm_epoc_pei_little_vec;

 extern const bfd_target armcoff_big_vec;
 extern const bfd_target armcoff_big_vec;

+extern const bfd_target armcoff_little_vec;

 extern const bfd_target armnetbsd_vec;
 extern const bfd_target armnetbsd_vec;

-extern const bfd_target armpe_little_vec;

 extern const bfd_target armpe_big_vec;
 extern const bfd_target armpe_big_vec;

-extern const bfd_target armpei_little_vec;
+extern const bfd_target armpe_little_vec;

 extern const bfd_target armpei_big_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 armpei_little_vec;

 extern const bfd_target b_out_vec_big_host;
 extern const bfd_target b_out_vec_little_host;
 extern const bfd_target bfd_efi_app_ia32_vec;
 extern const bfd_target bfd_efi_app_ia64_vec;
 extern const bfd_target b_out_vec_big_host;
 extern const bfd_target b_out_vec_little_host;
 extern const bfd_target bfd_efi_app_ia32_vec;
 extern const bfd_target bfd_efi_app_ia64_vec;

-extern const bfd_target bfd_elf64_alpha_vec;
-extern const bfd_target bfd_elf64_ia64_little_vec;
-extern const bfd_target bfd_elf64_ia64_big_vec;

 extern const bfd_target bfd_elf32_avr_vec;
 extern const bfd_target bfd_elf32_avr_vec;

+extern const bfd_target bfd_elf32_big_generic_vec;

 extern const bfd_target bfd_elf32_bigarc_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_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_bigarm_vec;

 extern const bfd_target bfd_elf32_bigmips_vec;
 extern const bfd_target bfd_elf32_bigmips_vec;

-extern const bfd_target bfd_elf64_bigmips_vec;
+extern const bfd_target bfd_elf32_cr16c_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_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_frv_vec;
+extern const bfd_target bfd_elf32_frvfdpic_vec;
+extern const bfd_target bfd_elf32_h8300_vec;
+extern const bfd_target bfd_elf32_hppa_linux_vec;

 extern const bfd_target bfd_elf32_hppa_vec;
 extern const bfd_target bfd_elf32_i370_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_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_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_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_littlearm_vec;

 extern const bfd_target bfd_elf32_littlemips_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_m32r_vec;

+extern const bfd_target bfd_elf32_m32rle_vec;
+extern const bfd_target bfd_elf32_m32rlin_vec;
+extern const bfd_target bfd_elf32_m32rlelin_vec;
+extern const bfd_target bfd_elf32_m68hc11_vec;
+extern const bfd_target bfd_elf32_m68hc12_vec;

 extern const bfd_target bfd_elf32_m68k_vec;
 extern const bfd_target bfd_elf32_m88k_vec;
 extern const bfd_target bfd_elf32_m68k_vec;
 extern const bfd_target bfd_elf32_m88k_vec;

+extern const bfd_target bfd_elf32_mcore_big_vec;
+extern const bfd_target bfd_elf32_mcore_little_vec;

 extern const bfd_target bfd_elf32_mn10200_vec;
 extern const bfd_target bfd_elf32_mn10300_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_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_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_sh_vec;

+extern const bfd_target bfd_elf32_shblin_vec;

 extern const bfd_target bfd_elf32_shl_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_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_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_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_big_generic_vec;

+extern const bfd_target bfd_elf64_bigmips_vec;
+extern const bfd_target bfd_elf64_hppa_linux_vec;
+extern const bfd_target bfd_elf64_hppa_vec;
+extern const bfd_target bfd_elf64_ia64_big_vec;
+extern const bfd_target bfd_elf64_ia64_hpux_big_vec;
+extern const bfd_target bfd_elf64_ia64_little_vec;

 extern const bfd_target bfd_elf64_little_generic_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_sh64_vec;
+extern const bfd_target bfd_elf64_sh64l_vec;
+extern const bfd_target bfd_elf64_sh64lin_vec;
+extern const bfd_target bfd_elf64_sh64blin_vec;
+extern const bfd_target bfd_elf64_sh64lnbsd_vec;
+extern const bfd_target bfd_elf64_sh64nbsd_vec;

 extern const bfd_target bfd_elf64_sparc_vec;
 extern const bfd_target bfd_elf64_sparc_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_powerpcle_pei_vec;
+extern const bfd_target cris_aout_vec;

 extern const bfd_target demo_64_vec;
 extern const bfd_target ecoff_big_vec;
 extern const bfd_target 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 ecoff_biglittle_vec;

+extern const bfd_target ecoff_little_vec;

 extern const bfd_target ecoffalpha_little_vec;
 extern const bfd_target ecoffalpha_little_vec;

+extern const bfd_target go32coff_vec;
+extern const bfd_target go32stubbedcoff_vec;

 extern const bfd_target h8300coff_vec;
 extern const bfd_target h8500coff_vec;
 extern const bfd_target host_aout_vec;
 extern const bfd_target hp300bsd_vec;
 extern const bfd_target hp300hpux_vec;
 extern const bfd_target 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 i386aout_vec;
 extern const bfd_target i386bsd_vec;

+extern const bfd_target i386coff_vec;

 extern const bfd_target i386dynix_vec;
 extern const bfd_target i386freebsd_vec;
 extern const bfd_target 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 i386linux_vec;
 extern const bfd_target i386lynx_aout_vec;
 extern const bfd_target i386lynx_coff_vec;
 extern const bfd_target i386mach3_vec;
 extern const bfd_target i386msdos_vec;
 extern const bfd_target i386netbsd_vec;

+extern const bfd_target i386os9k_vec;
+extern const bfd_target i386pe_vec;
+extern const bfd_target i386pei_vec;

 extern const bfd_target i860coff_vec;
 extern const bfd_target icoff_big_vec;
 extern const bfd_target icoff_little_vec;
 extern const bfd_target ieee_vec;
 extern const bfd_target i860coff_vec;
 extern const bfd_target icoff_big_vec;
 extern const bfd_target icoff_little_vec;
 extern const bfd_target ieee_vec;

+extern const bfd_target m68k4knetbsd_vec;

 extern const bfd_target m68kaux_coff_vec;
 extern const bfd_target m68kcoff_vec;
 extern const bfd_target m68kcoffun_vec;
 extern const bfd_target m68kaux_coff_vec;
 extern const bfd_target m68kcoff_vec;
 extern const bfd_target m68kcoffun_vec;


@@ -592,82 +671,96 @@ 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 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 m88kbcs_vec;
 extern const bfd_target m88kmach3_vec;

-extern const bfd_target mipslpe_vec;
-extern const bfd_target mipslpei_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_pei_little_vec;
 extern const bfd_target mcore_pe_big_vec;
 extern const bfd_target mcore_pe_little_vec;
 extern const bfd_target mcore_pei_big_vec;
 extern const bfd_target mcore_pei_little_vec;

+extern const bfd_target mipslpe_vec;
+extern const bfd_target mipslpei_vec;

 extern const bfd_target newsos3_vec;
 extern const bfd_target 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_alpha_vec;

+extern const bfd_target nlm32_i386_vec;

 extern const bfd_target nlm32_powerpc_vec;
 extern const bfd_target nlm32_powerpc_vec;

-extern const bfd_target pc532netbsd_vec;
+extern const bfd_target nlm32_sparc_vec;

 extern const bfd_target oasys_vec;
 extern const bfd_target oasys_vec;

+extern const bfd_target or32coff_big_vec;

 extern const bfd_target pc532machaout_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 ppcboot_vec;
 extern const bfd_target riscix_vec;

-extern const bfd_target pmac_xcoff_vec;
+extern const bfd_target rs6000coff64_vec;

 extern const bfd_target rs6000coff_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 shcoff_small_vec;

+extern const bfd_target shcoff_vec;

 extern const bfd_target shlcoff_small_vec;
 extern const bfd_target shlcoff_small_vec;

+extern const bfd_target shlcoff_vec;

 extern const bfd_target shlpe_vec;
 extern const bfd_target shlpei_vec;
 extern const bfd_target shlpe_vec;
 extern const bfd_target shlpei_vec;

+extern const bfd_target som_vec;
+extern const bfd_target sparccoff_vec;

 extern const bfd_target sparcle_aout_vec;
 extern const bfd_target sparclinux_vec;
 extern const bfd_target sparclynx_aout_vec;
 extern const bfd_target sparclynx_coff_vec;
 extern const bfd_target sparcnetbsd_vec;
 extern const bfd_target 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 sunos_big_vec;

-extern const bfd_target tekhex_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 tic54x_coff0_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_beh_vec;

-extern const bfd_target tic54x_coff1_vec;
+extern const bfd_target tic54x_coff0_vec;

 extern const bfd_target tic54x_coff1_beh_vec;
 extern const bfd_target tic54x_coff1_beh_vec;

-extern const bfd_target tic54x_coff2_vec;
+extern const bfd_target tic54x_coff1_vec;

 extern const bfd_target tic54x_coff2_beh_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 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;

-extern const bfd_target we32kcoff_vec;

 extern const bfd_target w65_vec;
 extern const bfd_target w65_vec;

+extern const bfd_target we32kcoff_vec;

 extern const bfd_target z8kcoff_vec;
 
 extern const bfd_target z8kcoff_vec;
 

-/* srec is always included.  */
+/* These are always included.  */

 extern const bfd_target srec_vec;
 extern const bfd_target symbolsrec_vec;
 extern const bfd_target srec_vec;
 extern const bfd_target symbolsrec_vec;

-
-/* binary is always included.  */
+extern const bfd_target tekhex_vec;

 extern const bfd_target binary_vec;
 extern const bfd_target binary_vec;

-
-/* 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 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 hppabsd_core_vec;

+extern const bfd_target hpux_core_vec;

 extern const bfd_target irix_core_vec;
 extern const bfd_target netbsd_core_vec;
 extern const bfd_target osf_core_vec;
 extern const bfd_target irix_core_vec;
 extern const bfd_target netbsd_core_vec;
 extern const bfd_target osf_core_vec;

+extern const bfd_target ptrace_core_vec;

 extern const bfd_target sco5_core_vec;
 extern const bfd_target trad_core_vec;
 extern const bfd_target sco5_core_vec;
 extern const bfd_target trad_core_vec;

-extern const bfd_target ptrace_core_vec;

 
 

-const bfd_target * const bfd_target_vector[] = {
+extern const bfd_target bfd_elf32_am33lin_vec;
+static const bfd_target * const _bfd_target_vector[] = {

 
 #ifdef SELECT_VECS
 
 
 #ifdef SELECT_VECS
 


@@ -686,111 +779,187 @@ 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,

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

        &aout_mips_big_vec,
 #endif
        &aout_mips_little_vec,
        &aout_mips_big_vec,
 #endif
        &aout_mips_little_vec,

+#if 0
+       &apollocoff_vec,
+#endif
+       &arm_epoc_pe_big_vec,
+       &arm_epoc_pe_little_vec,
+       &arm_epoc_pei_big_vec,
+       &arm_epoc_pei_little_vec,
+       &armcoff_big_vec,
+       &armcoff_little_vec,
+       &armnetbsd_vec,
+       &armpe_big_vec,
+       &armpe_little_vec,
+       &armpei_big_vec,
+       &armpei_little_vec,

        &b_out_vec_big_host,
        &b_out_vec_little_host,
        &b_out_vec_big_host,
        &b_out_vec_little_host,

-

        &bfd_efi_app_ia32_vec,
 #ifdef BFD64
        &bfd_efi_app_ia64_vec,
 #endif
        &bfd_efi_app_ia32_vec,
 #ifdef BFD64
        &bfd_efi_app_ia64_vec,
 #endif

+       &bfd_elf32_avr_vec,

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

-#ifdef BFD64
-       &bfd_elf64_alpha_vec,
-       &bfd_elf64_ia64_little_vec,
-       &bfd_elf64_ia64_big_vec,
-#endif
-       &bfd_elf32_avr_vec,

        &bfd_elf32_bigarc_vec,
        &bfd_elf32_bigarc_vec,

-        &bfd_elf32_bigarm_vec,
-        &bfd_elf32_bigarm_oabi_vec,
+       &bfd_elf32_bigarm_oabi_vec,
+       &bfd_elf32_bigarm_vec,

        &bfd_elf32_bigmips_vec,
        &bfd_elf32_bigmips_vec,

-#ifdef BFD64
-       &bfd_elf64_bigmips_vec,
-#endif
+       &bfd_elf32_cr16c_vec,
+       &bfd_elf32_cris_vec,

        &bfd_elf32_d10v_vec,
        &bfd_elf32_d30v_vec,
        &bfd_elf32_d10v_vec,
        &bfd_elf32_d30v_vec,

-#if 0
+       &bfd_elf32_dlx_big_vec,
+       &bfd_elf32_fr30_vec,
+       &bfd_elf32_frv_vec,
+       &bfd_elf32_frvfdpic_vec,
+       &bfd_elf32_h8300_vec,
+       &bfd_elf32_hppa_linux_vec,

        &bfd_elf32_hppa_vec,
        &bfd_elf32_hppa_vec,

-#endif

        &bfd_elf32_i370_vec,
        &bfd_elf32_i370_vec,

+       &bfd_elf32_i386_freebsd_vec,

        &bfd_elf32_i386_vec,
        &bfd_elf32_i386_vec,

+       &bfd_elf32_i860_little_vec,

        &bfd_elf32_i860_vec,
        &bfd_elf32_i960_vec,
        &bfd_elf32_i860_vec,
        &bfd_elf32_i960_vec,

+#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_little_generic_vec,
        &bfd_elf32_littlearc_vec,

-        &bfd_elf32_littlearm_vec,
-        &bfd_elf32_littlearm_oabi_vec,
+       &bfd_elf32_littlearm_oabi_vec,
+       &bfd_elf32_littlearm_vec,

        &bfd_elf32_littlemips_vec,
        &bfd_elf32_littlemips_vec,

-#ifdef BFD64
-       &bfd_elf64_littlemips_vec,
-#endif

        &bfd_elf32_m32r_vec,
        &bfd_elf32_m32r_vec,

-       &bfd_elf32_mn10200_vec,
-       &bfd_elf32_mn10300_vec,
+        &bfd_elf32_m32rle_vec,
+        &bfd_elf32_m32rlin_vec,
+        &bfd_elf32_m32rlelin_vec,
+       &bfd_elf32_m68hc11_vec,
+       &bfd_elf32_m68hc12_vec,

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

-       &bfd_elf32_sparc_vec,
+       &bfd_elf32_mcore_big_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_or32_big_vec,

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

+       &bfd_elf32_s390_vec,
+        &bfd_elf32_sh_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_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_elf32_vax_vec,
+       &bfd_elf32_xstormy16_vec,
+       &bfd_elf32_xtensa_be_vec,
+       &bfd_elf32_xtensa_le_vec,
+#ifdef BFD64
+       &bfd_elf64_alpha_freebsd_vec,
+       &bfd_elf64_alpha_vec,

        &bfd_elf64_big_generic_vec,
        &bfd_elf64_big_generic_vec,

+       &bfd_elf64_bigmips_vec,
+       &bfd_elf64_hppa_linux_vec,
+       &bfd_elf64_hppa_vec,
+       &bfd_elf64_ia64_big_vec,
+       &bfd_elf64_ia64_hpux_big_vec,
+       &bfd_elf64_ia64_little_vec,

        &bfd_elf64_little_generic_vec,
        &bfd_elf64_little_generic_vec,

-#endif
-#if 0
+       &bfd_elf64_littlemips_vec,
+       &bfd_elf64_mmix_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,

        &bfd_elf64_sparc_vec,
        &bfd_elf64_sparc_vec,

+       &bfd_elf64_tradbigmips_vec,
+       &bfd_elf64_tradlittlemips_vec,
+       &bfd_elf64_x86_64_vec,
+       &bfd_mmo_vec, 

 #endif
 #endif

-       /* We don't include cisco_core_*_vec.  Although it has a magic number,
-          the magic number isn't at the beginning of the file, and thus
-          might spuriously match other kinds of files.  */
+       &bfd_powerpc_pe_vec,
+       &bfd_powerpc_pei_vec,
+       &bfd_powerpcle_pe_vec,
+       &bfd_powerpcle_pei_vec,
+       &cris_aout_vec,

 #ifdef BFD64
 #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,
 #endif
        &ecoff_big_vec,

-       &ecoff_little_vec,

        &ecoff_biglittle_vec,
        &ecoff_biglittle_vec,

+       &ecoff_little_vec,

 #ifdef BFD64
        &ecoffalpha_little_vec,
 #endif
 #ifdef BFD64
        &ecoffalpha_little_vec,
 #endif

+       &go32coff_vec,
+       &go32stubbedcoff_vec,

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

-#endif
-#if 0                          /* Clashes with sunos_big_vec magic no.  */
+       /* Clashes with sunos_big_vec magic no.  */

        &hp300bsd_vec,
 #endif
        &hp300hpux_vec,
        &hp300bsd_vec,
 #endif
        &hp300hpux_vec,

-#if defined (HOST_HPPAHPUX) || defined (HOST_HPPABSD) || defined (HOST_HPPAOSF)
-        &som_vec,
-#endif

        &i386aout_vec,
        &i386bsd_vec,
        &i386coff_vec,
        &i386aout_vec,
        &i386bsd_vec,
        &i386coff_vec,

+#if 0
+       &i386dynix_vec,
+#endif

        &i386freebsd_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.  */


@@ -807,20 +976,14 @@ const bfd_target * const bfd_target_vector[] = {
        &i386os9k_vec,
        &i386pe_vec,
        &i386pei_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,
+       &i860coff_vec,

        &icoff_big_vec,
        &icoff_little_vec,
        &ieee_vec,
        &icoff_big_vec,
        &icoff_little_vec,
        &ieee_vec,

+#if 0
+       &m68k4knetbsd_vec,
+       &m68kaux_coff_vec,
+#endif

        &m68kcoff_vec,
        &m68kcoffun_vec,
 #if 0
        &m68kcoff_vec,
        &m68kcoffun_vec,
 #if 0


@@ -834,17 +997,22 @@ 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_pei_little_vec,
        &mcore_pe_big_vec,
        &mcore_pe_little_vec,
        &mcore_pei_big_vec,
        &mcore_pei_little_vec,

+       &mipslpe_vec,
+       &mipslpei_vec,

        &newsos3_vec,
        &newsos3_vec,

-       &nlm32_i386_vec,
-       &nlm32_sparc_vec,

 #ifdef BFD64
        &nlm32_alpha_vec,
 #endif
 #ifdef BFD64
        &nlm32_alpha_vec,
 #endif

-       &pc532netbsd_vec,
+       &nlm32_i386_vec,
+       &nlm32_powerpc_vec,
+       &nlm32_sparc_vec,

 #if 0
        /* We have no oasys tools anymore, so we can't test any of this
           anymore. If you want to test the stuff yourself, go ahead...
 #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...


@@ -853,48 +1021,65 @@ 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,
        &pc532machaout_vec,

+       &pc532netbsd_vec,
+       &pdp11_aout_vec,
+       &pef_vec,
+       &pef_xlib_vec,

 #if 0
 #if 0

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

 #endif
 #endif

+       &ppcboot_vec,

 #if 0
 #if 0

-       /* This has the same magic number as RS/6000. */
-       &pmac_xcoff_vec,
+       /* We have no way of distinguishing these from other a.out variants.  */
+       &riscix_vec,
+#endif
+#ifdef BFD64
+       &rs6000coff64_vec,

 #endif
        &rs6000coff_vec,
 #endif
        &rs6000coff_vec,

-       &ppcboot_vec,
-       &shcoff_vec,
-       &shlcoff_vec,

        &shcoff_small_vec,
        &shcoff_small_vec,

+       &shcoff_vec,

        &shlcoff_small_vec,
        &shlcoff_small_vec,

+       &shlcoff_vec,
+       &shlpe_vec,
+       &shlpei_vec,
+#if defined (HOST_HPPAHPUX) || defined (HOST_HPPABSD) || defined (HOST_HPPAOSF)
+       &som_vec,
+#endif
+       &sparccoff_vec,

        &sparcle_aout_vec,
        &sparclinux_vec,
        &sparclynx_aout_vec,
        &sparclynx_coff_vec,
        &sparcnetbsd_vec,
        &sunos_big_vec,
        &sparcle_aout_vec,
        &sparclinux_vec,
        &sparclynx_aout_vec,
        &sparclynx_coff_vec,
        &sparcnetbsd_vec,
        &sunos_big_vec,

-       &aout0_big_vec,
+       &sym_vec,

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

-       &tic54x_coff0_vec,

        &tic54x_coff0_beh_vec,
        &tic54x_coff0_beh_vec,

-       &tic54x_coff1_vec,
+       &tic54x_coff0_vec,

        &tic54x_coff1_beh_vec,
        &tic54x_coff1_beh_vec,

-       &tic54x_coff2_vec,
+       &tic54x_coff1_vec,

        &tic54x_coff2_beh_vec,
        &tic54x_coff2_beh_vec,

+       &tic54x_coff2_vec,

        &tic80coff_vec,
        &tic80coff_vec,

+       &vaxbsd_vec,

        &vaxnetbsd_vec,
        &vaxnetbsd_vec,

+       &vax1knetbsd_vec,

        &versados_vec,
 #ifdef BFD64
        &vms_alpha_vec,
 #endif
        &vms_vax_vec,
        &versados_vec,
 #ifdef BFD64
        &vms_alpha_vec,
 #endif
        &vms_vax_vec,

+       &w65_vec,

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

-
+       &bfd_elf32_am33lin_vec,

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


@@ -912,12 +1097,19 @@ const bfd_target * const bfd_target_vector[] = {
 #ifdef AIX386_CORE
        &aix386_core_vec,
 #endif
 #ifdef AIX386_CORE
        &aix386_core_vec,
 #endif

-#ifdef HPUX_CORE
-       &hpux_core_vec,
+#if 0
+       /* We don't include cisco_core_*_vec.  Although it has a magic number,
+          the magic number isn't at the beginning of the file, and thus
+          might spuriously match other kinds of files.  */
+       &cisco_core_big_vec,
+       &cisco_core_little_vec,

 #endif
 #ifdef HPPABSD_CORE
        &hppabsd_core_vec,
 #endif
 #endif
 #ifdef HPPABSD_CORE
        &hppabsd_core_vec,
 #endif

+#ifdef HPUX_CORE
+       &hpux_core_vec,
+#endif

 #ifdef IRIX_CORE
        &irix_core_vec,
 #endif
 #ifdef IRIX_CORE
        &irix_core_vec,
 #endif


@@ -927,19 +1119,19 @@ const bfd_target * const bfd_target_vector[] = {
 #ifdef OSF_CORE
        &osf_core_vec,
 #endif
 #ifdef OSF_CORE
        &osf_core_vec,
 #endif

+#ifdef PTRACE_CORE
+       &ptrace_core_vec,
+#endif

 #ifdef SCO5_CORE
        &sco5_core_vec,
 #endif
 #ifdef SCO5_CORE
        &sco5_core_vec,
 #endif

-#ifdef TRAD_CORE
+#ifdef TRAD_CORE

        &trad_core_vec,
 #endif
 
        &trad_core_vec,
 #endif
 

-#ifdef PTRACE_CORE
-       &ptrace_core_vec,
-#endif
-

        NULL /* end of list marker */
 };
        NULL /* end of list marker */
 };

+const bfd_target * const *bfd_target_vector = _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.  */


@@ -951,10 +1143,21 @@ 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.  */

-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.  */
 
 \f
 /* This array maps configuration triplets onto BFD vectors.  */
 


@@ -974,13 +1177,10 @@ static const struct targmatch bfd_target_match[] = {
   { NULL, NULL }
 };
 
   { 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 a target vector, given a name or configuration triplet.  */
 
 static const bfd_target *

-find_target (name)
-     const char *name;
+find_target (const char *name)

 {
   const bfd_target * const *target;
   const struct targmatch *match;
 {
   const bfd_target * const *target;
   const struct targmatch *match;


@@ -1012,7 +1212,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.


@@ -1020,22 +1220,21 @@ DESCRIPTION
        name or a configuration triplet.
 */
 
        name or a configuration triplet.
 */
 

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

 {
   const bfd_target *target;
 
   if (bfd_default_vector[0] != NULL
       && strcmp (name, bfd_default_vector[0]->name) == 0)
 {
   const bfd_target *target;
 
   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;

 }
 
 /*
 }
 
 /*


@@ -1043,7 +1242,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


@@ -1054,13 +1253,11 @@ DESCRIPTION
        variable to "default" will cause the first entry in the target
        list to be returned, and "target_defaulted" will be set in the
        BFD.  This causes <<bfd_check_format>> to loop over all the
        variable to "default" will cause the first entry in the target
        list to be returned, and "target_defaulted" will be set in the
        BFD.  This causes <<bfd_check_format>> to loop over all the

-       targets to find the one that matches the file being read.   
+       targets to find the one that matches the file being read.

 */
 
 const bfd_target *
 */
 
 const bfd_target *

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

 {
   const char *targname;
   const bfd_target *target;
 {
   const char *targname;
   const bfd_target *target;


@@ -1070,10 +1267,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


@@ -1081,7 +1278,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)


@@ -1096,7 +1293,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


@@ -1106,29 +1303,33 @@ DESCRIPTION
 */
 
 const char **
 */
 
 const char **

-bfd_target_list ()
+bfd_target_list (void)

 {
 {

-  int vec_length= 0;
+  int vec_length = 0;
+  bfd_size_type amt;

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

-    const bfd_target * const *target;
-  CONST  char **name_list, **name_ptr;
+  const bfd_target * const *target;
+  const  char **name_list, **name_ptr;

 
   for (target = &bfd_target_vector[0]; *target != NULL; target++)
     vec_length++;
 
 
   for (target = &bfd_target_vector[0]; *target != NULL; target++)
     vec_length++;
 

-  name_ptr = name_list = (CONST char **)
-    bfd_zmalloc ((vec_length + 1) * sizeof (char **));
+  amt = (vec_length + 1) * sizeof (char **);
+  name_ptr = name_list = 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;
 }
 


@@ -1137,7 +1338,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


@@ -1148,15 +1351,14 @@ DESCRIPTION
 */
 
 const bfd_target *
 */
 
 const bfd_target *

-bfd_search_for_target (search_func, data)
-     int (* search_func) PARAMS ((const bfd_target * target, void * data));
-     void * data;
+bfd_search_for_target (int (*search_func) (const bfd_target *, void *),
+                      void *data)

 {
 {

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

 
 

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

 
   return NULL;
 }
 
   return NULL;
 }