Touches most files in bfd/, so likely will be blamed for everything..

o  bfd_read and bfd_write lose an unnecessary param and become
   bfd_bread and bfd_bwrite.

o  bfd_*alloc now all take a bfd_size_type arg, and will error if
   size_t is too small.  eg. 32 bit host, 64 bit bfd, verrry big files
   or bugs in linker scripts etc.

o  file_ptr becomes a bfd_signed_vma.  Besides matching sizes with
   various other types involved in handling sections, this should make
   it easier for bfd to support a 64 bit off_t on 32 bit hosts that
   provide it.

o  I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
   generally available.  They now cast their args to bfd_vma and
   bfd_byte * as appropriate, which removes a swag of casts from the
   source.

o  Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
   aout-encap.c.

o  Zillions of formatting and -Wconversion fixes.

1 files changed, 202 insertions, 201 deletions

diff --git a/bfd/targets.c b/bfd/targets.c
index 5201ee9..0972d7f 100644
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -208,27 +208,27 @@ 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_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 *));
+.  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 *));
+.  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 *));
+.  void           (*bfd_putx16) PARAMS ((bfd_vma, bfd_byte *));
 
 Byte swapping for the headers
 
-.  bfd_vma      (*bfd_h_getx64) PARAMS ((const 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 *));
-.  bfd_vma      (*bfd_h_getx32) 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 *));
+.  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 *));
+.  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.
@@ -239,11 +239,11 @@ Check the format of a file being read.  Return a <<bfd_target *>> or zero.
 
 Set the format of a file being written.
 
-.  boolean             (*_bfd_set_format[bfd_type_end]) PARAMS ((bfd *));
+.  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 *));
+.  boolean  (*_bfd_write_contents[bfd_type_end]) PARAMS ((bfd *));
 
 The general target vector.  These vectors are initialized using the
 BFD_JUMP_TABLE macros.
@@ -258,17 +258,16 @@ BFD_JUMP_TABLE macros.
 .CAT(NAME,_get_section_contents_in_window)
 .
 .  {* Called when the BFD is being closed to do any necessary cleanup.  *}
-.  boolean       (*_close_and_cleanup) PARAMS ((bfd *));
+.  boolean  (*_close_and_cleanup) PARAMS ((bfd *));
 .  {* Ask the BFD to free all cached information.  *}
-.  boolean (*_bfd_free_cached_info) PARAMS ((bfd *));
+.  boolean  (*_bfd_free_cached_info) PARAMS ((bfd *));
 .  {* Called when a new section is created.  *}
-.  boolean       (*_new_section_hook) PARAMS ((bfd *, sec_ptr));
+.  boolean  (*_new_section_hook) PARAMS ((bfd *, sec_ptr));
 .  {* Read the contents of a section.  *}
-.  boolean       (*_bfd_get_section_contents) PARAMS ((bfd *, sec_ptr, PTR,
-.                                            file_ptr, bfd_size_type));
-.  boolean       (*_bfd_get_section_contents_in_window)
-.                          PARAMS ((bfd *, sec_ptr, bfd_window *,
-.                                   file_ptr, bfd_size_type));
+.  boolean  (*_bfd_get_section_contents) PARAMS ((bfd *, sec_ptr, PTR,
+.                                                 file_ptr, bfd_size_type));
+.  boolean  (*_bfd_get_section_contents_in_window)
+.    PARAMS ((bfd *, sec_ptr, bfd_window *, file_ptr, bfd_size_type));
 .
 .  {* Entry points to copy private data.  *}
 .#define BFD_JUMP_TABLE_COPY(NAME)\
@@ -280,23 +279,23 @@ BFD_JUMP_TABLE macros.
 .CAT(NAME,_bfd_print_private_bfd_data)\
 .  {* Called to copy BFD general private data from one object file
 .     to another.  *}
-.  boolean	 (*_bfd_copy_private_bfd_data) PARAMS ((bfd *, bfd *));
+.  boolean  (*_bfd_copy_private_bfd_data) PARAMS ((bfd *, bfd *));
 .  {* Called to merge BFD general private data from one object file
 .     to a common output file when linking.  *}
-.  boolean	 (*_bfd_merge_private_bfd_data) PARAMS ((bfd *, bfd *));
+.  boolean  (*_bfd_merge_private_bfd_data) PARAMS ((bfd *, bfd *));
 .  {* Called to copy BFD private section data from one object file
 .     to another.  *}
-.  boolean       (*_bfd_copy_private_section_data) PARAMS ((bfd *, sec_ptr,
-.                                                       bfd *, sec_ptr));
+.  boolean  (*_bfd_copy_private_section_data) PARAMS ((bfd *, sec_ptr,
+.                                                      bfd *, sec_ptr));
 .  {* Called to copy BFD private symbol data from one symbol
 .     to another.  *}
-.  boolean       (*_bfd_copy_private_symbol_data) PARAMS ((bfd *, asymbol *,
-.							   bfd *, asymbol *));
+.  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));
+.  boolean  (*_bfd_set_private_flags) PARAMS ((bfd *, flagword));
 .
 .  {* Called to print private BFD data *}
-.  boolean       (*_bfd_print_private_bfd_data) PARAMS ((bfd *, PTR));
+.  boolean  (*_bfd_print_private_bfd_data) PARAMS ((bfd *, PTR));
 .
 .  {* Core file entry points.  *}
 .#define BFD_JUMP_TABLE_CORE(NAME)\
@@ -322,15 +321,12 @@ BFD_JUMP_TABLE macros.
 .  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));
+.    PARAMS ((bfd *, char **, bfd_size_type *, const char **));
+.  void     (*_bfd_truncate_arname) PARAMS ((bfd *, const char *, char *));
+.  boolean  (*write_armap)
+.    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 *));
 .#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 *));
@@ -349,37 +345,34 @@ BFD_JUMP_TABLE macros.
 .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));
+.  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 *));
+.  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 *));
+.  boolean  (*_bfd_is_local_label_name) PARAMS ((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) PARAMS ((bfd *, struct symbol_cache_entry *));
+.  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.  *}
-.  asymbol *  (*_bfd_make_debug_symbol) PARAMS ((
-.       bfd *abfd,
-.       void *ptr,
-.       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))
-.  long  (*_read_minisymbols) PARAMS ((bfd *, boolean, PTR *,
-.                                      unsigned int *));
+.  long     (*_read_minisymbols) PARAMS ((bfd *, boolean, PTR *,
+.                                         unsigned int *));
 .#define bfd_minisymbol_to_symbol(b, d, m, f) \
 .  BFD_SEND (b, _minisymbol_to_symbol, (b, d, m, f))
 .  asymbol *(*_minisymbol_to_symbol) PARAMS ((bfd *, boolean, const PTR,
@@ -390,22 +383,21 @@ BFD_JUMP_TABLE macros.
 .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 **));
+.  long     (*_get_reloc_upper_bound) PARAMS ((bfd *, sec_ptr));
+.  long     (*_bfd_canonicalize_reloc) PARAMS ((bfd *, sec_ptr, arelent **,
+.                                               struct symbol_cache_entry **));
 .  {* See documentation on reloc types.  *}
 .  reloc_howto_type *
-.       (*reloc_type_lookup) PARAMS ((bfd *abfd,
-.                                     bfd_reloc_code_real_type code));
+.           (*reloc_type_lookup) PARAMS ((bfd *, bfd_reloc_code_real_type));
 .
 .  {* 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));
+.  boolean  (*_bfd_set_arch_mach) PARAMS ((bfd *, enum bfd_architecture,
+.                                          unsigned long));
+.  boolean  (*_bfd_set_section_contents) PARAMS ((bfd *, sec_ptr, PTR,
+.                                                 file_ptr, bfd_size_type));
 .
 .  {* Routines used by the linker.  *}
 .#define BFD_JUMP_TABLE_LINK(NAME)\
@@ -418,34 +410,33 @@ BFD_JUMP_TABLE macros.
 .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) PARAMS ((bfd *,
-.                    struct bfd_link_info *, struct bfd_link_order *,
-.                    bfd_byte *data, boolean relocateable,
-.                    struct symbol_cache_entry **));
+.  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 *, boolean, struct symbol_cache_entry **));
 .
-.  boolean    (*_bfd_relax_section) PARAMS ((bfd *, struct sec *,
-.                    struct bfd_link_info *, boolean *again));
+.  boolean  (*_bfd_relax_section)
+.    PARAMS ((bfd *, struct sec *, struct bfd_link_info *, boolean *));
 .
 .  {* 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 *));
 .
 .  {* Add symbols from this object file into the hash table.  *}
-.  boolean (*_bfd_link_add_symbols) PARAMS ((bfd *, struct bfd_link_info *));
+.  boolean  (*_bfd_link_add_symbols) PARAMS ((bfd *, struct bfd_link_info *));
 .
 .  {* 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 *));
+.  boolean  (*_bfd_final_link) PARAMS ((bfd *, struct bfd_link_info *));
 .
 .  {* Should this section be split up into smaller pieces during linking.  *}
-.  boolean (*_bfd_link_split_section) PARAMS ((bfd *, struct sec *));
+.  boolean  (*_bfd_link_split_section) PARAMS ((bfd *, struct sec *));
 .
 .  {* Remove sections that are not referenced from the output.  *}
-.  boolean (*_bfd_gc_sections) PARAMS ((bfd *, struct bfd_link_info *));
+.  boolean  (*_bfd_gc_sections) PARAMS ((bfd *, struct bfd_link_info *));
 .
 .  {* Attempt to merge SEC_MERGE sections.  *}
-.  boolean (*_bfd_merge_sections) PARAMS ((bfd *, struct bfd_link_info *));
+.  boolean  (*_bfd_merge_sections) PARAMS ((bfd *, struct bfd_link_info *));
 .
 .  {* Routines to handle dynamic symbols and relocs.  *}
 .#define BFD_JUMP_TABLE_DYNAMIC(NAME)\
@@ -454,14 +445,14 @@ BFD_JUMP_TABLE macros.
 .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 *));
+.  long     (*_bfd_get_dynamic_symtab_upper_bound) PARAMS ((bfd *));
 .  {* 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.  *}
-.  long  (*_bfd_get_dynamic_reloc_upper_bound) PARAMS ((bfd *));
+.  long     (*_bfd_get_dynamic_reloc_upper_bound) PARAMS ((bfd *));
 .  {* Read in the dynamic relocs.  *}
-.  long  (*_bfd_canonicalize_dynamic_reloc)
+.  long     (*_bfd_canonicalize_dynamic_reloc)
 .    PARAMS ((bfd *, arelent **, struct symbol_cache_entry **));
 .
 
@@ -570,12 +561,12 @@ extern const bfd_target bfd_elf64_ia64_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_tradbigmips_vec;
-extern const bfd_target bfd_elf64_tradlittlemips_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_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_powerpc_pe_vec;
 extern const bfd_target bfd_powerpc_pei_vec;
@@ -657,7 +648,6 @@ 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 tekhex_vec;
 extern const bfd_target tic30_aout_vec;
 extern const bfd_target tic30_coff_vec;
 extern const bfd_target tic54x_coff0_beh_vec;
@@ -675,28 +665,25 @@ extern const bfd_target w65_vec;
 extern const bfd_target we32kcoff_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;
-
-/* binary is always included.  */
+extern const bfd_target tekhex_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 hpux_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 ptrace_core_vec;
 extern const bfd_target sco5_core_vec;
 extern const bfd_target trad_core_vec;
-extern const bfd_target ptrace_core_vec;
 
 static const bfd_target * const _bfd_target_vector[] = {
 
@@ -717,134 +704,144 @@ static const bfd_target * const _bfd_target_vector[] = {
 	   it wasn't omitted by mistake.  */
 	&a29kcoff_big_vec,
 	&a_out_adobe_vec,
-#if 0				/* No one seems to use this.  */
+	&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,
+#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,
-
 	&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,
-#ifdef BFD64
-	&bfd_elf64_alpha_vec,
-	&bfd_elf64_hppa_vec,
-	&bfd_elf64_hppa_linux_vec,
-	&bfd_elf64_ia64_aix_little_vec,
-	&bfd_elf64_ia64_aix_big_vec,
-	&bfd_elf64_ia64_little_vec,
-	&bfd_elf64_ia64_big_vec,
-#endif
-	&bfd_elf32_avr_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,
-#ifdef BFD64
-	&bfd_elf64_bigmips_vec,
-#endif
 	&bfd_elf32_cris_vec,
-	&bfd_elf32_us_cris_vec,
 	&bfd_elf32_d10v_vec,
 	&bfd_elf32_d30v_vec,
-	&bfd_elf32_hppa_vec,
+	&bfd_elf32_fr30_vec,
 	&bfd_elf32_hppa_linux_vec,
+	&bfd_elf32_hppa_vec,
 	&bfd_elf32_i370_vec,
 	&bfd_elf32_i386_vec,
-#ifdef BFD64
-        &bfd_elf64_x86_64_vec,
-#endif
-	&bfd_elf32_i860_vec,
 	&bfd_elf32_i860_little_vec,
+	&bfd_elf32_i860_vec,
 	&bfd_elf32_i960_vec,
+#if 0
+	&bfd_elf32_ia64_big_vec,
+#endif
 	&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,
-#ifdef BFD64
-	&bfd_elf64_littlemips_vec,
-#endif
 	&bfd_elf32_m32r_vec,
-	&bfd_elf32_mn10200_vec,
-	&bfd_elf32_mn10300_vec,
 	&bfd_elf32_m68hc11_vec,
 	&bfd_elf32_m68hc12_vec,
 	&bfd_elf32_m68k_vec,
 	&bfd_elf32_m88k_vec,
+	&bfd_elf32_mcore_big_vec,
+	&bfd_elf32_mcore_little_vec,
+	&bfd_elf32_mn10200_vec,
+	&bfd_elf32_mn10300_vec,
 	&bfd_elf32_openrisc_vec,
 	&bfd_elf32_pj_vec,
 	&bfd_elf32_pjl_vec,
 	&bfd_elf32_powerpc_vec,
 	&bfd_elf32_powerpcle_vec,
-#ifdef BFD64
-	&bfd_elf64_powerpc_vec,
-	&bfd_elf64_powerpcle_vec,
-#endif
+	&bfd_elf32_s390_vec,
+        &bfd_elf32_sh_vec,
+        &bfd_elf32_shblin_vec,
+        &bfd_elf32_shl_vec,
+        &bfd_elf32_shlin_vec,
 	&bfd_elf32_sparc_vec,
-	&bfd_elf32_v850_vec,
-	&bfd_elf32_fr30_vec,
-	&bfd_elf32_mcore_big_vec,
-	&bfd_elf32_mcore_little_vec,
 	&bfd_elf32_tradbigmips_vec,
 	&bfd_elf32_tradlittlemips_vec,
+	&bfd_elf32_us_cris_vec,
+	&bfd_elf32_v850_vec,
 #ifdef BFD64
-	&bfd_elf64_tradbigmips_vec,
-	&bfd_elf64_tradlittlemips_vec,
-	/* No one seems to use this.  */
+	&bfd_elf64_alpha_vec,
 	&bfd_elf64_big_generic_vec,
+	&bfd_elf64_bigmips_vec,
+	&bfd_elf64_hppa_linux_vec,
+	&bfd_elf64_hppa_vec,
+	&bfd_elf64_ia64_aix_big_vec,
+	&bfd_elf64_ia64_aix_little_vec,
+	&bfd_elf64_ia64_big_vec,
+	&bfd_elf64_ia64_little_vec,
 	&bfd_elf64_little_generic_vec,
-#endif
+	&bfd_elf64_littlemips_vec,
+	&bfd_elf64_powerpc_vec,
+	&bfd_elf64_powerpcle_vec,
+	&bfd_elf64_s390_vec,
 #if 0
 	&bfd_elf64_sparc_vec,
 #endif
-	/* We don't include cisco_core_*_vec.  Although it has a magic number,
-	   the magic number isn't at the beginning of the file, and thus
-	   might spuriously match other kinds of files.  */
-
-        &cris_aout_vec,
+	&bfd_elf64_tradbigmips_vec,
+	&bfd_elf64_tradlittlemips_vec,
+	&bfd_elf64_x86_64_vec,
+#endif
+	&bfd_powerpc_pe_vec,
+	&bfd_powerpc_pei_vec,
+	&bfd_powerpcle_pe_vec,
+	&bfd_powerpcle_pei_vec,
+	&cris_aout_vec,
 #ifdef BFD64
 	&demo_64_vec,	/* Only compiled if host has long-long support */
 #endif
 	&ecoff_big_vec,
-	&ecoff_little_vec,
 	&ecoff_biglittle_vec,
+	&ecoff_little_vec,
 #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,
-#endif
-#if 0				/* Clashes with sunos_big_vec magic no.  */
+	/* Clashes with sunos_big_vec magic no.  */
 	&hp300bsd_vec,
 #endif
 	&hp300hpux_vec,
-#if defined (HOST_HPPAHPUX) || defined (HOST_HPPABSD) || defined (HOST_HPPAOSF)
-        &som_vec,
-#endif
 	&i386aout_vec,
 	&i386bsd_vec,
 	&i386coff_vec,
+#if 0
+	&i386dynix_vec,
+#endif
 	&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.  */
@@ -861,20 +858,14 @@ static const bfd_target * const _bfd_target_vector[] = {
 	&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,
+#if 0
+	&m68k4knetbsd_vec,
+	&m68kaux_coff_vec,
+#endif
 	&m68kcoff_vec,
 	&m68kcoffun_vec,
 #if 0
@@ -892,13 +883,15 @@ static const bfd_target * const _bfd_target_vector[] = {
 	&mcore_pe_little_vec,
 	&mcore_pei_big_vec,
 	&mcore_pei_little_vec,
+	&mipslpe_vec,
+	&mipslpei_vec,
 	&newsos3_vec,
-	&nlm32_i386_vec,
-	&nlm32_sparc_vec,
 #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...
@@ -908,41 +901,45 @@ static const bfd_target * const _bfd_target_vector[] = {
 	&oasys_vec,
 #endif
 	&pc532machaout_vec,
+	&pc532netbsd_vec,
 	&pdp11_aout_vec,
 #if 0
-	/* We have no way of distinguishing these from other a.out variants */
-	&aout_arm_big_vec,
-	&aout_arm_little_vec,
-	&riscix_vec,
-#endif
-#if 0
 	/* This has the same magic number as RS/6000.  */
 	&pmac_xcoff_vec,
 #endif
-	&rs6000coff_vec,
+	&ppcboot_vec,
+#if 0
+	/* We have no way of distinguishing these from other a.out variants */
+	&riscix_vec,
+#endif
 #ifdef BFD64
 	&rs6000coff64_vec,
 #endif
-	&ppcboot_vec,
-	&shcoff_vec,
-	&shlcoff_vec,
+	&rs6000coff_vec,
 	&shcoff_small_vec,
+	&shcoff_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,
-	&aout0_big_vec,
 	&tic30_aout_vec,
 	&tic30_coff_vec,
-	&tic54x_coff0_vec,
 	&tic54x_coff0_beh_vec,
-	&tic54x_coff1_vec,
+	&tic54x_coff0_vec,
 	&tic54x_coff1_beh_vec,
-	&tic54x_coff2_vec,
+	&tic54x_coff1_vec,
 	&tic54x_coff2_beh_vec,
+	&tic54x_coff2_vec,
 	&tic80coff_vec,
 	&vaxnetbsd_vec,
 	&versados_vec,
@@ -950,12 +947,9 @@ static const bfd_target * const _bfd_target_vector[] = {
 	&vms_alpha_vec,
 #endif
 	&vms_vax_vec,
+	&w65_vec,
 	&we32kcoff_vec,
 	&z8kcoff_vec,
-        &bfd_elf32_s390_vec, 
-#ifdef BFD64
-        &bfd_elf64_s390_vec,
-#endif
 #endif /* not SELECT_VECS */
 
 /* Always support S-records, for convenience.  */
@@ -973,12 +967,19 @@ static const bfd_target * const _bfd_target_vector[] = {
 #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
+#ifdef HPUX_CORE
+	&hpux_core_vec,
+#endif
 #ifdef IRIX_CORE
 	&irix_core_vec,
 #endif
@@ -988,17 +989,16 @@ static const bfd_target * const _bfd_target_vector[] = {
 #ifdef OSF_CORE
 	&osf_core_vec,
 #endif
+#ifdef PTRACE_CORE
+	&ptrace_core_vec,
+#endif
 #ifdef SCO5_CORE
 	&sco5_core_vec,
 #endif
-#ifdef	TRAD_CORE
+#ifdef TRAD_CORE
 	&trad_core_vec,
 #endif
 
-#ifdef	PTRACE_CORE
-	&ptrace_core_vec,
-#endif
-
 	NULL /* end of list marker */
 };
 const bfd_target * const *bfd_target_vector = _bfd_target_vector;
@@ -1105,7 +1105,7 @@ FUNCTION
 	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
@@ -1171,19 +1171,20 @@ const char **
 bfd_target_list ()
 {
   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
-    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++;
 
-  name_ptr = name_list = (CONST char **)
-    bfd_zmalloc ((vec_length + 1) * sizeof (char **));
+  amt = (vec_length + 1) * sizeof (char **);
+  name_ptr = name_list = (const char **) bfd_zmalloc (amt);
 
   if (name_list == NULL)
     return NULL;