X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fxsym.c;h=cf4a67167a31acb13c2404430410a69a7f53c7e5;hb=4b4477b52eee60ddadd59c36ffd778bbd9ab1c07;hp=5f3cc1d019725f4ad086a3b6a641ba2b75397d5c;hpb=0e71e4955cd1a6ad7d03775dec5df49323204dec;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/xsym.c b/bfd/xsym.c
index 5f3cc1d019..cf4a67167a 100644
--- a/bfd/xsym.c
+++ b/bfd/xsym.c
@@ -1,12 +1,11 @@
 /* xSYM symbol-file support for BFD.
-   Copyright 1999, 2000, 2001, 2002, 2003, 2004
-   Free Software Foundation, Inc.
+   Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
    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
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -16,60 +15,66 @@
 
    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.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
 
+/* xSYM is the debugging format used by CodeWarrior on Mac OS classic.  */
+
+#include "sysdep.h"
+#include "alloca-conf.h"
 #include "xsym.h"
 #include "bfd.h"
-#include "sysdep.h"
 #include "libbfd.h"
 
-#define bfd_sym_close_and_cleanup _bfd_generic_close_and_cleanup
-#define bfd_sym_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
-#define bfd_sym_new_section_hook _bfd_generic_new_section_hook
-#define bfd_sym_bfd_is_local_label_name bfd_generic_is_local_label_name
-#define bfd_sym_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
-#define bfd_sym_get_lineno _bfd_nosymbols_get_lineno
-#define bfd_sym_find_nearest_line _bfd_nosymbols_find_nearest_line
-#define bfd_sym_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define bfd_sym_read_minisymbols _bfd_generic_read_minisymbols
-#define bfd_sym_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
-#define bfd_sym_get_reloc_upper_bound _bfd_norelocs_get_reloc_upper_bound
-#define bfd_sym_canonicalize_reloc _bfd_norelocs_canonicalize_reloc
-#define bfd_sym_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup
-#define bfd_sym_set_arch_mach _bfd_generic_set_arch_mach
-#define bfd_sym_get_section_contents _bfd_generic_get_section_contents
-#define bfd_sym_set_section_contents _bfd_generic_set_section_contents
-#define bfd_sym_bfd_get_relocated_section_contents bfd_generic_get_relocated_section_contents
-#define bfd_sym_bfd_relax_section bfd_generic_relax_section
-#define bfd_sym_bfd_gc_sections bfd_generic_gc_sections
-#define bfd_sym_bfd_merge_sections bfd_generic_merge_sections
-#define bfd_sym_bfd_is_group_section bfd_generic_is_group_section
-#define bfd_sym_bfd_discard_group bfd_generic_discard_group
-#define bfd_sym_section_already_linked \
-  _bfd_generic_section_already_linked
-#define bfd_sym_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define bfd_sym_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
-#define bfd_sym_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define bfd_sym_bfd_link_just_syms _bfd_generic_link_just_syms
-#define bfd_sym_bfd_final_link _bfd_generic_final_link
-#define bfd_sym_bfd_link_split_section _bfd_generic_link_split_section
-#define bfd_sym_get_section_contents_in_window  _bfd_generic_get_section_contents_in_window
-
-static int pstrcmp PARAMS ((unsigned char *, unsigned char *));
-static unsigned long compute_offset
-  PARAMS ((unsigned long, unsigned long, unsigned long, unsigned long));
+#define bfd_sym_close_and_cleanup		    _bfd_generic_close_and_cleanup
+#define bfd_sym_bfd_free_cached_info		    _bfd_generic_bfd_free_cached_info
+#define bfd_sym_new_section_hook		    _bfd_generic_new_section_hook
+#define bfd_sym_bfd_is_local_label_name		    bfd_generic_is_local_label_name
+#define bfd_sym_bfd_is_target_special_symbol	    _bfd_bool_bfd_asymbol_false
+#define bfd_sym_get_lineno			    _bfd_nosymbols_get_lineno
+#define bfd_sym_find_nearest_line		    _bfd_nosymbols_find_nearest_line
+#define bfd_sym_find_line			    _bfd_nosymbols_find_line
+#define bfd_sym_find_inliner_info		    _bfd_nosymbols_find_inliner_info
+#define bfd_sym_get_symbol_version_string	    _bfd_nosymbols_get_symbol_version_string
+#define bfd_sym_bfd_make_debug_symbol		    _bfd_nosymbols_bfd_make_debug_symbol
+#define bfd_sym_read_minisymbols		    _bfd_generic_read_minisymbols
+#define bfd_sym_minisymbol_to_symbol		    _bfd_generic_minisymbol_to_symbol
+#define bfd_sym_set_arch_mach			    _bfd_generic_set_arch_mach
+#define bfd_sym_get_section_contents		    _bfd_generic_get_section_contents
+#define bfd_sym_set_section_contents		    _bfd_generic_set_section_contents
+#define bfd_sym_bfd_get_relocated_section_contents  bfd_generic_get_relocated_section_contents
+#define bfd_sym_bfd_relax_section		    bfd_generic_relax_section
+#define bfd_sym_bfd_gc_sections			    bfd_generic_gc_sections
+#define bfd_sym_bfd_lookup_section_flags	    bfd_generic_lookup_section_flags
+#define bfd_sym_bfd_merge_sections		    bfd_generic_merge_sections
+#define bfd_sym_bfd_is_group_section		    bfd_generic_is_group_section
+#define bfd_sym_bfd_group_name			    bfd_generic_group_name
+#define bfd_sym_bfd_discard_group		    bfd_generic_discard_group
+#define bfd_sym_section_already_linked		    _bfd_generic_section_already_linked
+#define bfd_sym_bfd_define_common_symbol	    bfd_generic_define_common_symbol
+#define bfd_sym_bfd_link_hide_symbol		    _bfd_generic_link_hide_symbol
+#define bfd_sym_bfd_define_start_stop		    bfd_generic_define_start_stop
+#define bfd_sym_bfd_link_hash_table_create	    _bfd_generic_link_hash_table_create
+#define bfd_sym_bfd_link_add_symbols		    _bfd_generic_link_add_symbols
+#define bfd_sym_bfd_link_just_syms		    _bfd_generic_link_just_syms
+#define bfd_sym_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
+#define bfd_sym_bfd_final_link			    _bfd_generic_final_link
+#define bfd_sym_bfd_link_split_section		    _bfd_generic_link_split_section
+#define bfd_sym_get_section_contents_in_window	    _bfd_generic_get_section_contents_in_window
+#define bfd_sym_bfd_link_check_relocs		    _bfd_generic_link_check_relocs
 
 extern const bfd_target sym_vec;
 
 static int
-pstrcmp (a, b)
-     unsigned char *a;
-     unsigned char *b;
+pstrcmp (const char *as, const char *bs)
 {
+  const unsigned char *a = (const unsigned char *) as;
+  const unsigned char *b = (const unsigned char *) bs;
   unsigned char clen;
   int ret;
 
-  clen = (a[0] > b[0]) ? a[0] : b[0];
+  clen = (a[0] > b[0]) ? b[0] : a[0];
   ret = memcmp (a + 1, b + 1, clen);
   if (ret != 0)
     return ret;
@@ -79,43 +84,39 @@ pstrcmp (a, b)
   else if (a[0] < b[0])
     return -1;
   else
-    return 0;
+    return 1;
 }
 
 static unsigned long
-compute_offset (first_page, page_size, entry_size, index)
-     unsigned long first_page;
-     unsigned long page_size;
-     unsigned long entry_size;
-     unsigned long index;
+compute_offset (unsigned long first_page,
+		unsigned long page_size,
+		unsigned long entry_size,
+		unsigned long sym_index)
 {
   unsigned long entries_per_page = page_size / entry_size;
-  unsigned long page_number = first_page + (index / entries_per_page);
-  unsigned long page_offset = (index % entries_per_page) * entry_size;
+  unsigned long page_number = first_page + (sym_index / entries_per_page);
+  unsigned long page_offset = (sym_index % entries_per_page) * entry_size;
 
   return (page_number * page_size) + page_offset;
 }
 
 bfd_boolean
-bfd_sym_mkobject (abfd)
-     bfd *abfd ATTRIBUTE_UNUSED;
+bfd_sym_mkobject (bfd *abfd ATTRIBUTE_UNUSED)
 {
   return 1;
 }
 
 void
-bfd_sym_print_symbol (abfd, afile, symbol, how)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     PTR afile ATTRIBUTE_UNUSED;
-     asymbol *symbol ATTRIBUTE_UNUSED;
-     bfd_print_symbol_type how ATTRIBUTE_UNUSED;
+bfd_sym_print_symbol (bfd *abfd ATTRIBUTE_UNUSED,
+		      void * afile ATTRIBUTE_UNUSED,
+		      asymbol *symbol ATTRIBUTE_UNUSED,
+		      bfd_print_symbol_type how ATTRIBUTE_UNUSED)
 {
   return;
 }
 
 bfd_boolean
-bfd_sym_valid (abfd)
-     bfd *abfd;
+bfd_sym_valid (bfd *abfd)
 {
   if (abfd == NULL || abfd->xvec == NULL)
     return 0;
@@ -124,16 +125,14 @@ bfd_sym_valid (abfd)
 }
 
 unsigned char *
-bfd_sym_read_name_table (abfd, dshb)
-     bfd *abfd;
-     bfd_sym_header_block *dshb;
+bfd_sym_read_name_table (bfd *abfd, bfd_sym_header_block *dshb)
 {
   unsigned char *rstr;
   long ret;
   size_t table_size = dshb->dshb_nte.dti_page_count * dshb->dshb_page_size;
   size_t table_offset = dshb->dshb_nte.dti_first_page * dshb->dshb_page_size;
 
-  rstr = (unsigned char *) bfd_alloc (abfd, table_size);
+  rstr = bfd_alloc (abfd, table_size);
   if (rstr == NULL)
     return rstr;
 
@@ -149,10 +148,9 @@ bfd_sym_read_name_table (abfd, dshb)
 }
 
 void
-bfd_sym_parse_file_reference_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_file_reference *entry;
+bfd_sym_parse_file_reference_v32 (unsigned char *buf,
+				  size_t len,
+				  bfd_sym_file_reference *entry)
 {
   BFD_ASSERT (len == 6);
 
@@ -161,10 +159,9 @@ bfd_sym_parse_file_reference_v32 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_disk_table_v32 (buf, len, table)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_table_info *table;
+bfd_sym_parse_disk_table_v32 (unsigned char *buf,
+			      size_t len,
+			      bfd_sym_table_info *table)
 {
   BFD_ASSERT (len == 8);
 
@@ -174,10 +171,9 @@ bfd_sym_parse_disk_table_v32 (buf, len, table)
 }
 
 void
-bfd_sym_parse_header_v32 (buf, len, header)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_header_block *header;
+bfd_sym_parse_header_v32 (unsigned char *buf,
+			  size_t len,
+			  bfd_sym_header_block *header)
 {
   BFD_ASSERT (len == 154);
 
@@ -206,9 +202,7 @@ bfd_sym_parse_header_v32 (buf, len, header)
 }
 
 int
-bfd_sym_read_header_v32 (abfd, header)
-     bfd *abfd;
-     bfd_sym_header_block *header;
+bfd_sym_read_header_v32 (bfd *abfd, bfd_sym_header_block *header)
 {
   unsigned char buf[154];
   long ret;
@@ -223,18 +217,16 @@ bfd_sym_read_header_v32 (abfd, header)
 }
 
 int
-bfd_sym_read_header_v34 (abfd, header)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     bfd_sym_header_block *header ATTRIBUTE_UNUSED;
+bfd_sym_read_header_v34 (bfd *abfd ATTRIBUTE_UNUSED,
+			 bfd_sym_header_block *header ATTRIBUTE_UNUSED)
 {
   abort ();
 }
 
 int
-bfd_sym_read_header (abfd, header, version)
-     bfd *abfd;
-     bfd_sym_header_block *header;
-     bfd_sym_version version;
+bfd_sym_read_header (bfd *abfd,
+		     bfd_sym_header_block *header,
+		     bfd_sym_version version)
 {
   switch (version)
     {
@@ -246,16 +238,14 @@ bfd_sym_read_header (abfd, header, version)
       return bfd_sym_read_header_v32 (abfd, header);
     case BFD_SYM_VERSION_3_1:
     default:
-      return FALSE;
+      return 0;
     }
 }
 
 int
-bfd_sym_read_version (abfd, version)
-     bfd *abfd;
-     bfd_sym_version *version;
+bfd_sym_read_version (bfd *abfd, bfd_sym_version *version)
 {
-  unsigned char version_string[32];
+  char version_string[32];
   long ret;
 
   ret = bfd_bread (version_string, sizeof (version_string), abfd);
@@ -279,10 +269,9 @@ bfd_sym_read_version (abfd, version)
 }
 
 void
-bfd_sym_display_table_summary (f, dti, name)
-     FILE *f;
-     bfd_sym_table_info *dti;
-     const char *name;
+bfd_sym_display_table_summary (FILE *f,
+			       bfd_sym_table_info *dti,
+			       const char *name)
 {
   fprintf (f, "%-6s %13ld %13ld %13ld\n",
 	   name,
@@ -292,9 +281,7 @@ bfd_sym_display_table_summary (f, dti, name)
 }
 
 void
-bfd_sym_display_header (f, dshb)
-     FILE *f;
-     bfd_sym_header_block *dshb;
+bfd_sym_display_header (FILE *f, bfd_sym_header_block *dshb)
 {
   fprintf (f, "            Version: %.*s\n", dshb->dshb_id[0], dshb->dshb_id + 1);
   fprintf (f, "          Page Size: 0x%x\n", dshb->dshb_page_size);
@@ -328,10 +315,9 @@ bfd_sym_display_header (f, dshb)
 }
 
 void
-bfd_sym_parse_resources_table_entry_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_resources_table_entry *entry;
+bfd_sym_parse_resources_table_entry_v32 (unsigned char *buf,
+					 size_t len,
+					 bfd_sym_resources_table_entry *entry)
 {
   BFD_ASSERT (len == 18);
 
@@ -344,10 +330,9 @@ bfd_sym_parse_resources_table_entry_v32 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_modules_table_entry_v33 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_modules_table_entry *entry;
+bfd_sym_parse_modules_table_entry_v33 (unsigned char *buf,
+				       size_t len,
+				       bfd_sym_modules_table_entry *entry)
 {
   BFD_ASSERT (len == 46);
 
@@ -369,10 +354,9 @@ bfd_sym_parse_modules_table_entry_v33 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_file_references_table_entry_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_file_references_table_entry *entry;
+bfd_sym_parse_file_references_table_entry_v32 (unsigned char *buf,
+					       size_t len,
+					       bfd_sym_file_references_table_entry *entry)
 {
   unsigned int type;
 
@@ -400,10 +384,9 @@ bfd_sym_parse_file_references_table_entry_v32 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_contained_modules_table_entry_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_contained_modules_table_entry *entry;
+bfd_sym_parse_contained_modules_table_entry_v32 (unsigned char *buf,
+						 size_t len,
+						 bfd_sym_contained_modules_table_entry *entry)
 {
   unsigned int type;
 
@@ -426,10 +409,9 @@ bfd_sym_parse_contained_modules_table_entry_v32 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_contained_variables_table_entry_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_contained_variables_table_entry *entry;
+bfd_sym_parse_contained_variables_table_entry_v32 (unsigned char *buf,
+						   size_t len,
+						   bfd_sym_contained_variables_table_entry *entry)
 {
   unsigned int type;
 
@@ -464,7 +446,10 @@ bfd_sym_parse_contained_variables_table_entry_v32 (buf, len, entry)
 	}
       else if (entry->entry.la_size <= BFD_SYM_CVTE_SCA)
 	{
-	  memcpy (&entry->entry.address.lastruct.la, buf + 10, BFD_SYM_CVTE_SCA);
+#if BFD_SYM_CVTE_SCA > 0
+	  memcpy (&entry->entry.address.lastruct.la, buf + 10,
+		  BFD_SYM_CVTE_SCA);
+#endif
 	  entry->entry.address.lastruct.la_kind = buf[23];
 	}
       else if (entry->entry.la_size == BFD_SYM_CVTE_BIG_LA)
@@ -476,10 +461,9 @@ bfd_sym_parse_contained_variables_table_entry_v32 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_contained_statements_table_entry_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_contained_statements_table_entry *entry;
+bfd_sym_parse_contained_statements_table_entry_v32 (unsigned char *buf,
+						    size_t len,
+						    bfd_sym_contained_statements_table_entry *entry)
 {
   unsigned int type;
 
@@ -508,10 +492,9 @@ bfd_sym_parse_contained_statements_table_entry_v32 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_contained_labels_table_entry_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_contained_labels_table_entry *entry;
+bfd_sym_parse_contained_labels_table_entry_v32 (unsigned char *buf,
+						size_t len,
+						bfd_sym_contained_labels_table_entry *entry)
 {
   unsigned int type;
 
@@ -542,10 +525,9 @@ bfd_sym_parse_contained_labels_table_entry_v32 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_type_table_entry_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_type_table_entry *entry;
+bfd_sym_parse_type_table_entry_v32 (unsigned char *buf,
+				    size_t len,
+				    bfd_sym_type_table_entry *entry)
 {
   BFD_ASSERT (len == 4);
 
@@ -553,13 +535,11 @@ bfd_sym_parse_type_table_entry_v32 (buf, len, entry)
 }
 
 int
-bfd_sym_fetch_resources_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_resources_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_resources_table_entry (bfd *abfd,
+				     bfd_sym_resources_table_entry *entry,
+				     unsigned long sym_index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-			  bfd_sym_resources_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_resources_table_entry *);
   unsigned long offset;
   unsigned long entry_size;
   unsigned char buf[18];
@@ -569,7 +549,7 @@ bfd_sym_fetch_resources_table_entry (abfd, entry, index)
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -593,7 +573,7 @@ bfd_sym_fetch_resources_table_entry (abfd, entry, index)
 
   offset = compute_offset (sdata->header.dshb_rte.dti_first_page,
 			   sdata->header.dshb_page_size,
-			   entry_size, index);
+			   entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -606,13 +586,11 @@ bfd_sym_fetch_resources_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_modules_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_modules_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_modules_table_entry (bfd *abfd,
+				   bfd_sym_modules_table_entry *entry,
+				   unsigned long sym_index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-			  bfd_sym_modules_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_modules_table_entry *);
   unsigned long offset;
   unsigned long entry_size;
   unsigned char buf[46];
@@ -622,7 +600,7 @@ bfd_sym_fetch_modules_table_entry (abfd, entry, index)
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -646,7 +624,7 @@ bfd_sym_fetch_modules_table_entry (abfd, entry, index)
 
   offset = compute_offset (sdata->header.dshb_mte.dti_first_page,
 			   sdata->header.dshb_page_size,
-			   entry_size, index);
+			   entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -659,13 +637,11 @@ bfd_sym_fetch_modules_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_file_references_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_file_references_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_file_references_table_entry (bfd *abfd,
+					   bfd_sym_file_references_table_entry *entry,
+					   unsigned long sym_index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-			  bfd_sym_file_references_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_file_references_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[8];
@@ -675,7 +651,7 @@ bfd_sym_fetch_file_references_table_entry (abfd, entry, index)
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -698,7 +674,7 @@ bfd_sym_fetch_file_references_table_entry (abfd, entry, index)
 
   offset = compute_offset (sdata->header.dshb_frte.dti_first_page,
 			   sdata->header.dshb_page_size,
-			   entry_size, index);
+			   entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -711,13 +687,11 @@ bfd_sym_fetch_file_references_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_contained_modules_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_contained_modules_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_contained_modules_table_entry (bfd *abfd,
+					     bfd_sym_contained_modules_table_entry *entry,
+					     unsigned long sym_index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-			  bfd_sym_contained_modules_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_contained_modules_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[6];
@@ -727,7 +701,7 @@ bfd_sym_fetch_contained_modules_table_entry (abfd, entry, index)
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -750,7 +724,7 @@ bfd_sym_fetch_contained_modules_table_entry (abfd, entry, index)
 
   offset = compute_offset (sdata->header.dshb_cmte.dti_first_page,
 			   sdata->header.dshb_page_size,
-			   entry_size, index);
+			   entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -763,13 +737,11 @@ bfd_sym_fetch_contained_modules_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_contained_variables_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_contained_variables_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_contained_variables_table_entry (bfd *abfd,
+					       bfd_sym_contained_variables_table_entry *entry,
+					       unsigned long sym_index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-			  bfd_sym_contained_variables_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_contained_variables_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[26];
@@ -779,7 +751,7 @@ bfd_sym_fetch_contained_variables_table_entry (abfd, entry, index)
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -802,7 +774,7 @@ bfd_sym_fetch_contained_variables_table_entry (abfd, entry, index)
 
   offset = compute_offset (sdata->header.dshb_cvte.dti_first_page,
 			   sdata->header.dshb_page_size,
-			   entry_size, index);
+			   entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -815,13 +787,11 @@ bfd_sym_fetch_contained_variables_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_contained_statements_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_contained_statements_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_contained_statements_table_entry (bfd *abfd,
+						bfd_sym_contained_statements_table_entry *entry,
+						unsigned long sym_index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-			  bfd_sym_contained_statements_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_contained_statements_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[8];
@@ -831,7 +801,7 @@ bfd_sym_fetch_contained_statements_table_entry (abfd, entry, index)
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -854,7 +824,7 @@ bfd_sym_fetch_contained_statements_table_entry (abfd, entry, index)
 
   offset = compute_offset (sdata->header.dshb_csnte.dti_first_page,
 			   sdata->header.dshb_page_size,
-			   entry_size, index);
+			   entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -867,13 +837,11 @@ bfd_sym_fetch_contained_statements_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_contained_labels_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_contained_labels_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_contained_labels_table_entry (bfd *abfd,
+					    bfd_sym_contained_labels_table_entry *entry,
+					    unsigned long sym_index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-			  bfd_sym_contained_labels_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_contained_labels_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[12];
@@ -883,7 +851,7 @@ bfd_sym_fetch_contained_labels_table_entry (abfd, entry, index)
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -906,7 +874,7 @@ bfd_sym_fetch_contained_labels_table_entry (abfd, entry, index)
 
   offset = compute_offset (sdata->header.dshb_clte.dti_first_page,
 			   sdata->header.dshb_page_size,
-			   entry_size, index);
+			   entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -919,13 +887,11 @@ bfd_sym_fetch_contained_labels_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_contained_types_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_contained_types_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_contained_types_table_entry (bfd *abfd,
+					   bfd_sym_contained_types_table_entry *entry,
+					   unsigned long sym_index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-			  bfd_sym_contained_types_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_contained_types_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[0];
@@ -935,7 +901,7 @@ bfd_sym_fetch_contained_types_table_entry (abfd, entry, index)
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -958,7 +924,7 @@ bfd_sym_fetch_contained_types_table_entry (abfd, entry, index)
 
   offset = compute_offset (sdata->header.dshb_ctte.dti_first_page,
 			   sdata->header.dshb_page_size,
-			   entry_size, index);
+			   entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -971,13 +937,11 @@ bfd_sym_fetch_contained_types_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_file_references_index_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_file_references_index_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_file_references_index_table_entry (bfd *abfd,
+						 bfd_sym_file_references_index_table_entry *entry,
+						 unsigned long sym_index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-			  bfd_sym_file_references_index_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_file_references_index_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[0];
@@ -987,7 +951,7 @@ bfd_sym_fetch_file_references_index_table_entry (abfd, entry, index)
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -1010,7 +974,7 @@ bfd_sym_fetch_file_references_index_table_entry (abfd, entry, index)
 
   offset = compute_offset (sdata->header.dshb_fite.dti_first_page,
 			   sdata->header.dshb_page_size,
-			   entry_size, index);
+			   entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -1023,13 +987,11 @@ bfd_sym_fetch_file_references_index_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_constant_pool_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_constant_pool_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_constant_pool_entry (bfd *abfd,
+				   bfd_sym_constant_pool_entry *entry,
+				   unsigned long sym_index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-			  bfd_sym_constant_pool_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_constant_pool_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[0];
@@ -1039,7 +1001,7 @@ bfd_sym_fetch_constant_pool_entry (abfd, entry, index)
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -1062,7 +1024,7 @@ bfd_sym_fetch_constant_pool_entry (abfd, entry, index)
 
   offset = compute_offset (sdata->header.dshb_fite.dti_first_page,
 			   sdata->header.dshb_page_size,
-			   entry_size, index);
+			   entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -1075,13 +1037,11 @@ bfd_sym_fetch_constant_pool_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_type_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_type_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_type_table_entry (bfd *abfd,
+				bfd_sym_type_table_entry *entry,
+				unsigned long sym_index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-			  bfd_sym_type_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_type_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[4];
@@ -1111,7 +1071,7 @@ bfd_sym_fetch_type_table_entry (abfd, entry, index)
 
   offset = compute_offset (sdata->header.dshb_tte.dti_first_page,
 			   sdata->header.dshb_page_size,
-			   entry_size, index);
+			   entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -1124,16 +1084,13 @@ bfd_sym_fetch_type_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_type_information_table_entry (abfd, entry, offset)
-     bfd *abfd;
-     bfd_sym_type_information_table_entry *entry;
-     unsigned long offset;
+bfd_sym_fetch_type_information_table_entry (bfd *abfd,
+					    bfd_sym_type_information_table_entry *entry,
+					    unsigned long offset)
 {
   unsigned char buf[4];
-  bfd_sym_data_struct *sdata = NULL;
 
   BFD_ASSERT (bfd_sym_valid (abfd));
-  sdata = abfd->tdata.sym_data;
 
   if (offset == 0)
     return -1;
@@ -1170,10 +1127,9 @@ bfd_sym_fetch_type_information_table_entry (abfd, entry, offset)
 }
 
 int
-bfd_sym_fetch_type_table_information (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_type_information_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_type_table_information (bfd *abfd,
+				      bfd_sym_type_information_table_entry *entry,
+				      unsigned long sym_index)
 {
   bfd_sym_type_table_entry tindex;
   bfd_sym_data_struct *sdata = NULL;
@@ -1183,10 +1139,10 @@ bfd_sym_fetch_type_table_information (abfd, entry, index)
 
   if (sdata->header.dshb_tte.dti_object_count <= 99)
     return -1;
-  if (index < 100)
+  if (sym_index < 100)
     return -1;
 
-  if (bfd_sym_fetch_type_table_entry (abfd, &tindex, index - 100) < 0)
+  if (bfd_sym_fetch_type_table_entry (abfd, &tindex, sym_index - 100) < 0)
     return -1;
   if (bfd_sym_fetch_type_information_table_entry (abfd, entry, tindex) < 0)
     return -1;
@@ -1195,42 +1151,37 @@ bfd_sym_fetch_type_table_information (abfd, entry, index)
 }
 
 const unsigned char *
-bfd_sym_symbol_name (abfd, index)
-     bfd *abfd;
-     unsigned long index;
+bfd_sym_symbol_name (bfd *abfd, unsigned long sym_index)
 {
   bfd_sym_data_struct *sdata = NULL;
 
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
-    return "";
+  if (sym_index == 0)
+    return (const unsigned char *) "";
 
-  index *= 2;
-  if ((index / sdata->header.dshb_page_size)
+  sym_index *= 2;
+  if ((sym_index / sdata->header.dshb_page_size)
       > sdata->header.dshb_nte.dti_page_count)
-    return "\009[INVALID]";
+    return (const unsigned char *) "\09[INVALID]";
 
-  return (const unsigned char *) sdata->name_table + index;
+  return (const unsigned char *) sdata->name_table + sym_index;
 }
 
 const unsigned char *
-bfd_sym_module_name (abfd, index)
-     bfd *abfd;
-     unsigned long index;
+bfd_sym_module_name (bfd *abfd, unsigned long sym_index)
 {
   bfd_sym_modules_table_entry entry;
 
-  if (bfd_sym_fetch_modules_table_entry (abfd, &entry, index) < 0)
-    return "\011[INVALID]";
+  if (bfd_sym_fetch_modules_table_entry (abfd, &entry, sym_index) < 0)
+    return (const unsigned char *) "\09[INVALID]";
 
   return bfd_sym_symbol_name (abfd, entry.mte_nte_index);
 }
 
 const char *
-bfd_sym_unparse_storage_kind (kind)
-     enum bfd_sym_storage_kind kind;
+bfd_sym_unparse_storage_kind (enum bfd_sym_storage_kind kind)
 {
   switch (kind)
     {
@@ -1243,8 +1194,7 @@ bfd_sym_unparse_storage_kind (kind)
 }
 
 const char *
-bfd_sym_unparse_storage_class (kind)
-     enum bfd_sym_storage_class kind;
+bfd_sym_unparse_storage_class (enum bfd_sym_storage_class kind)
 {
   switch (kind)
     {
@@ -1261,8 +1211,7 @@ bfd_sym_unparse_storage_class (kind)
 }
 
 const char *
-bfd_sym_unparse_module_kind (kind)
-     enum bfd_sym_module_kind kind;
+bfd_sym_unparse_module_kind (enum bfd_sym_module_kind kind)
 {
   switch (kind)
     {
@@ -1278,8 +1227,7 @@ bfd_sym_unparse_module_kind (kind)
 }
 
 const char *
-bfd_sym_unparse_symbol_scope (scope)
-     enum bfd_sym_symbol_scope scope;
+bfd_sym_unparse_symbol_scope (enum bfd_sym_symbol_scope scope)
 {
   switch (scope)
     {
@@ -1291,10 +1239,9 @@ bfd_sym_unparse_symbol_scope (scope)
 }
 
 void
-bfd_sym_print_file_reference (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_file_reference *entry;
+bfd_sym_print_file_reference (bfd *abfd,
+			      FILE *f,
+			      bfd_sym_file_reference *entry)
 {
   bfd_sym_file_references_table_entry frtentry;
   int ret;
@@ -1314,10 +1261,9 @@ bfd_sym_print_file_reference (abfd, f, entry)
 }
 
 void
-bfd_sym_print_resources_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_resources_table_entry *entry;
+bfd_sym_print_resources_table_entry (bfd *abfd,
+				     FILE *f,
+				     bfd_sym_resources_table_entry *entry)
 {
   fprintf (f, " \"%.*s\" (NTE %lu), type \"%.4s\", num %u, size %lu, MTE %lu -- %lu",
 	   bfd_sym_symbol_name (abfd, entry->rte_nte_index)[0],
@@ -1327,10 +1273,9 @@ bfd_sym_print_resources_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_print_modules_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_modules_table_entry *entry;
+bfd_sym_print_modules_table_entry (bfd *abfd,
+				   FILE *f,
+				   bfd_sym_modules_table_entry *entry)
 {
   fprintf (f, "\"%.*s\" (NTE %lu)",
 	   bfd_sym_symbol_name (abfd, entry->mte_nte_index)[0],
@@ -1370,10 +1315,9 @@ bfd_sym_print_modules_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_print_file_references_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_file_references_table_entry *entry;
+bfd_sym_print_file_references_table_entry (bfd *abfd,
+					   FILE *f,
+					   bfd_sym_file_references_table_entry *entry)
 {
   switch (entry->generic.type)
     {
@@ -1403,10 +1347,9 @@ bfd_sym_print_file_references_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_print_contained_modules_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_contained_modules_table_entry *entry;
+bfd_sym_print_contained_modules_table_entry (bfd *abfd,
+					     FILE *f,
+					     bfd_sym_contained_modules_table_entry *entry)
 {
   switch (entry->generic.type)
     {
@@ -1425,10 +1368,9 @@ bfd_sym_print_contained_modules_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_print_contained_variables_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_contained_variables_table_entry *entry;
+bfd_sym_print_contained_variables_table_entry (bfd *abfd,
+					       FILE *f,
+					       bfd_sym_contained_variables_table_entry *entry)
 {
   if (entry->generic.type == BFD_SYM_END_OF_LIST)
     {
@@ -1476,10 +1418,9 @@ bfd_sym_print_contained_variables_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_print_contained_statements_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_contained_statements_table_entry *entry;
+bfd_sym_print_contained_statements_table_entry (bfd *abfd,
+						FILE *f,
+						bfd_sym_contained_statements_table_entry *entry)
 {
   if (entry->generic.type == BFD_SYM_END_OF_LIST)
     {
@@ -1503,10 +1444,9 @@ bfd_sym_print_contained_statements_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_print_contained_labels_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_contained_labels_table_entry *entry;
+bfd_sym_print_contained_labels_table_entry (bfd *abfd,
+					    FILE *f,
+					    bfd_sym_contained_labels_table_entry *entry)
 {
   if (entry->generic.type == BFD_SYM_END_OF_LIST)
     {
@@ -1531,17 +1471,15 @@ bfd_sym_print_contained_labels_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_print_contained_types_table_entry (abfd, f, entry)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     FILE *f;
-     bfd_sym_contained_types_table_entry *entry ATTRIBUTE_UNUSED;
+bfd_sym_print_contained_types_table_entry (bfd *abfd ATTRIBUTE_UNUSED,
+					   FILE *f,
+					   bfd_sym_contained_types_table_entry *entry ATTRIBUTE_UNUSED)
 {
   fprintf (f, "[UNIMPLEMENTED]");
 }
 
 const char *
-bfd_sym_type_operator_name (num)
-     unsigned char num;
+bfd_sym_type_operator_name (unsigned char num)
 {
   switch (num)
     {
@@ -1564,8 +1502,7 @@ bfd_sym_type_operator_name (num)
 }
 
 const char *
-bfd_sym_type_basic_name (num)
-     unsigned char num;
+bfd_sym_type_basic_name (unsigned char num)
 {
   switch (num)
     {
@@ -1592,12 +1529,11 @@ bfd_sym_type_basic_name (num)
 }
 
 int
-bfd_sym_fetch_long (buf, len, offset, offsetptr, value)
-     unsigned char *buf;
-     unsigned long len;
-     unsigned long offset;
-     unsigned long *offsetptr;
-     long *value;
+bfd_sym_fetch_long (unsigned char *buf,
+		    unsigned long len,
+		    unsigned long offset,
+		    unsigned long *offsetptr,
+		    long *value)
 {
   int ret;
 
@@ -1659,13 +1595,12 @@ bfd_sym_fetch_long (buf, len, offset, offsetptr, value)
 }
 
 void
-bfd_sym_print_type_information (abfd, f, buf, len, offset, offsetptr)
-     bfd *abfd;
-     FILE *f;
-     unsigned char *buf;
-     unsigned long len;
-     unsigned long offset;
-     unsigned long *offsetptr;
+bfd_sym_print_type_information (bfd *abfd,
+				FILE *f,
+				unsigned char *buf,
+				unsigned long len,
+				unsigned long offset,
+				unsigned long *offsetptr)
 {
   unsigned int type;
 
@@ -1714,7 +1649,7 @@ bfd_sym_print_type_information (abfd, f, buf, len, offset, offsetptr)
 		       bfd_sym_symbol_name (abfd, tinfo.nte_index)[0],
 		       &bfd_sym_symbol_name (abfd, tinfo.nte_index)[1]);
 	  }
-	fprintf (f, " (TTE %lu)", value);
+	fprintf (f, " (TTE %lu)", (unsigned long) value);
 	break;
       }
 
@@ -1725,26 +1660,28 @@ bfd_sym_print_type_information (abfd, f, buf, len, offset, offsetptr)
 
     case 3:
       {
-	unsigned long value;
+	long value;
 
 	fprintf (f, "scalar (0x%x) of ", type);
 	bfd_sym_print_type_information (abfd, f, buf, len, offset, &offset);
 	bfd_sym_fetch_long (buf, len, offset, &offset, &value);
-	fprintf (f, " (%lu)", value);
+	fprintf (f, " (%lu)", (unsigned long) value);
 	break;
       }
 
     case 5:
       {
-	unsigned long lower, upper, nelem;
-	unsigned long i;
+	long lower, upper, nelem;
+	int i;
 
 	fprintf (f, "enumeration (0x%x) of ", type);
 	bfd_sym_print_type_information (abfd, f, buf, len, offset, &offset);
 	bfd_sym_fetch_long (buf, len, offset, &offset, &lower);
 	bfd_sym_fetch_long (buf, len, offset, &offset, &upper);
 	bfd_sym_fetch_long (buf, len, offset, &offset, &nelem);
-	fprintf (f, " from %lu to %lu with %lu elements: ", lower, upper, nelem);
+	fprintf (f, " from %lu to %lu with %lu elements: ",
+		 (unsigned long) lower, (unsigned long) upper,
+		 (unsigned long) nelem);
 
 	for (i = 0; i < nelem; i++)
 	  {
@@ -1773,13 +1710,13 @@ bfd_sym_print_type_information (abfd, f, buf, len, offset, offsetptr)
 	  fprintf (f, "union (0x%x) of ", type);
 
 	bfd_sym_fetch_long (buf, len, offset, &offset, &nrec);
-	fprintf (f, "%lu elements: ", nrec);
+	fprintf (f, "%lu elements: ", (unsigned long) nrec);
 
 	for (i = 0; i < nrec; i++)
 	  {
 	    bfd_sym_fetch_long (buf, len, offset, &offset, &eloff);
 	    fprintf (f, "\n                ");
-	    fprintf (f, "offset %lu: ", eloff);
+	    fprintf (f, "offset %lu: ", (unsigned long) eloff);
 	    bfd_sym_print_type_information (abfd, f, buf, len, offset, &offset);
 	  }
 	break;
@@ -1807,7 +1744,7 @@ bfd_sym_print_type_information (abfd, f, buf, len, offset, offsetptr)
 		 bfd_sym_symbol_name (abfd, value)[0],
 		 &bfd_sym_symbol_name (abfd, value)[1]);
 
-      fprintf (f, " (NTE %lu) with type ", value);
+      fprintf (f, " (NTE %lu) with type ", (unsigned long) value);
       bfd_sym_print_type_information (abfd, f, buf, len, offset, &offset);
       break;
     }
@@ -1855,10 +1792,9 @@ bfd_sym_print_type_information (abfd, f, buf, len, offset, offsetptr)
 }
 
 void
-bfd_sym_print_type_information_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_type_information_table_entry *entry;
+bfd_sym_print_type_information_table_entry (bfd *abfd,
+					    FILE *f,
+					    bfd_sym_type_information_table_entry *entry)
 {
   unsigned char *buf;
   unsigned long offset;
@@ -1872,7 +1808,7 @@ bfd_sym_print_type_information_table_entry (abfd, f, entry)
 
   fprintf (f, "\n            ");
 
-  buf = alloca (entry->physical_size);
+  buf = malloc (entry->physical_size);
   if (buf == NULL)
     {
       fprintf (f, "[ERROR]\n");
@@ -1881,11 +1817,13 @@ bfd_sym_print_type_information_table_entry (abfd, f, entry)
   if (bfd_seek (abfd, entry->offset, SEEK_SET) < 0)
     {
       fprintf (f, "[ERROR]\n");
+      free (buf);
       return;
     }
   if (bfd_bread (buf, entry->physical_size, abfd) != entry->physical_size)
     {
       fprintf (f, "[ERROR]\n");
+      free (buf);
       return;
     }
 
@@ -1904,50 +1842,49 @@ bfd_sym_print_type_information_table_entry (abfd, f, entry)
   bfd_sym_print_type_information (abfd, f, buf, entry->physical_size, 0, &offset);
 
   if (offset != entry->physical_size)
-    fprintf (f, "\n            [parser used %lu bytes instead of %lu]", offset, entry->physical_size);        }
+    fprintf (f, "\n            [parser used %lu bytes instead of %lu]", offset, entry->physical_size);
+  free (buf);
+}
 
 void
-bfd_sym_print_file_references_index_table_entry (abfd, f, entry)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     FILE *f;
-     bfd_sym_file_references_index_table_entry *entry ATTRIBUTE_UNUSED;
+bfd_sym_print_file_references_index_table_entry (bfd *abfd ATTRIBUTE_UNUSED,
+						 FILE *f,
+						 bfd_sym_file_references_index_table_entry *entry ATTRIBUTE_UNUSED)
 {
   fprintf (f, "[UNIMPLEMENTED]");
 }
 
 void
-bfd_sym_print_constant_pool_entry (abfd, f, entry)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     FILE *f;
-     bfd_sym_constant_pool_entry *entry ATTRIBUTE_UNUSED;
+bfd_sym_print_constant_pool_entry (bfd *abfd ATTRIBUTE_UNUSED,
+				   FILE *f,
+				   bfd_sym_constant_pool_entry *entry ATTRIBUTE_UNUSED)
 {
   fprintf (f, "[UNIMPLEMENTED]");
 }
 
 unsigned char *
-bfd_sym_display_name_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     unsigned char *entry;
+bfd_sym_display_name_table_entry (bfd *abfd,
+				  FILE *f,
+				  unsigned char *entry)
 {
-  unsigned long index;
+  unsigned long sym_index;
   unsigned long offset;
   bfd_sym_data_struct *sdata = NULL;
 
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
-  index = (entry - sdata->name_table) / 2;
+  sym_index = (entry - sdata->name_table) / 2;
 
   if (sdata->version >= BFD_SYM_VERSION_3_4 && entry[0] == 255 && entry[1] == 0)
     {
       unsigned short length = bfd_getb16 (entry + 2);
-      fprintf (f, "[%8lu] \"%.*s\"\n", index, length, entry + 4);
+      fprintf (f, "[%8lu] \"%.*s\"\n", sym_index, length, entry + 4);
       offset = 2 + length + 1;
     }
   else
     {
       if (! (entry[0] == 0 || (entry[0] == 1 && entry[1] == '\0')))
-	fprintf (f, "[%8lu] \"%.*s\"\n", index, entry[0], entry + 1);
+	fprintf (f, "[%8lu] \"%.*s\"\n", sym_index, entry[0], entry + 1);
 
       if (sdata->version >= BFD_SYM_VERSION_3_4)
 	offset = entry[0] + 2;
@@ -1959,9 +1896,7 @@ bfd_sym_display_name_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_display_name_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_name_table (bfd *abfd, FILE *f)
 {
   unsigned long name_table_len;
   unsigned char *name_table, *name_table_end, *cur;
@@ -1986,9 +1921,7 @@ bfd_sym_display_name_table (abfd, f)
 }
 
 void
-bfd_sym_display_resources_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_resources_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_resources_table_entry entry;
@@ -2014,9 +1947,7 @@ bfd_sym_display_resources_table (abfd, f)
 }
 
 void
-bfd_sym_display_modules_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_modules_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_modules_table_entry entry;
@@ -2042,9 +1973,7 @@ bfd_sym_display_modules_table (abfd, f)
 }
 
 void
-bfd_sym_display_file_references_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_file_references_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_file_references_table_entry entry;
@@ -2070,9 +1999,7 @@ bfd_sym_display_file_references_table (abfd, f)
 }
 
 void
-bfd_sym_display_contained_modules_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_contained_modules_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_contained_modules_table_entry entry;
@@ -2098,9 +2025,7 @@ bfd_sym_display_contained_modules_table (abfd, f)
 }
 
 void
-bfd_sym_display_contained_variables_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_contained_variables_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_contained_variables_table_entry entry;
@@ -2128,9 +2053,7 @@ bfd_sym_display_contained_variables_table (abfd, f)
 }
 
 void
-bfd_sym_display_contained_statements_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_contained_statements_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_contained_statements_table_entry entry;
@@ -2156,9 +2079,7 @@ bfd_sym_display_contained_statements_table (abfd, f)
 }
 
 void
-bfd_sym_display_contained_labels_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_contained_labels_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_contained_labels_table_entry entry;
@@ -2184,9 +2105,7 @@ bfd_sym_display_contained_labels_table (abfd, f)
 }
 
 void
-bfd_sym_display_contained_types_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_contained_types_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_contained_types_table_entry entry;
@@ -2212,9 +2131,7 @@ bfd_sym_display_contained_types_table (abfd, f)
 }
 
 void
-bfd_sym_display_file_references_index_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_file_references_index_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_file_references_index_table_entry entry;
@@ -2240,9 +2157,7 @@ bfd_sym_display_file_references_index_table (abfd, f)
 }
 
 void
-bfd_sym_display_constant_pool (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_constant_pool (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_constant_pool_entry entry;
@@ -2268,12 +2183,10 @@ bfd_sym_display_constant_pool (abfd, f)
 }
 
 void
-bfd_sym_display_type_information_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_type_information_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
-  bfd_sym_type_table_entry index;
+  bfd_sym_type_table_entry sym_index;
   bfd_sym_type_information_table_entry entry;
   bfd_sym_data_struct *sdata = NULL;
 
@@ -2291,13 +2204,13 @@ bfd_sym_display_type_information_table (abfd, f)
 
   for (i = 100; i <= sdata->header.dshb_tte.dti_object_count; i++)
     {
-      if (bfd_sym_fetch_type_table_entry (abfd, &index, i - 100) < 0)
+      if (bfd_sym_fetch_type_table_entry (abfd, &sym_index, i - 100) < 0)
 	fprintf (f, " [%8lu] [INVALID]\n", i);
       else
 	{
-	  fprintf (f, " [%8lu] (TINFO %lu) ", i, index);
+	  fprintf (f, " [%8lu] (TINFO %lu) ", i, sym_index);
 
-	  if (bfd_sym_fetch_type_information_table_entry (abfd, &entry, index) < 0)
+	  if (bfd_sym_fetch_type_information_table_entry (abfd, &entry, sym_index) < 0)
 	    fprintf (f, "[INVALID]");
 	  else
 	    bfd_sym_print_type_information_table_entry (abfd, f, &entry);
@@ -2308,10 +2221,7 @@ bfd_sym_display_type_information_table (abfd, f)
 }
 
 int
-bfd_sym_scan (abfd, version, mdata)
-     bfd *abfd;
-     bfd_sym_version version;
-     bfd_sym_data_struct *mdata;
+bfd_sym_scan (bfd *abfd, bfd_sym_version version, bfd_sym_data_struct *mdata)
 {
   asection *bfdsec;
   const char *name = "symbols";
@@ -2328,7 +2238,7 @@ bfd_sym_scan (abfd, version, mdata)
   if (mdata->name_table == NULL)
     return -1;
 
-  bfdsec = bfd_make_section_anyway (abfd, name);
+  bfdsec = bfd_make_section_anyway_with_flags (abfd, name, SEC_HAS_CONTENTS);
   if (bfdsec == NULL)
     return -1;
 
@@ -2338,122 +2248,102 @@ bfd_sym_scan (abfd, version, mdata)
   bfdsec->filepos = 0;
   bfdsec->alignment_power = 0;
 
-  bfdsec->flags = SEC_HAS_CONTENTS;
-
   abfd->tdata.sym_data = mdata;
 
   return 0;
 }
 
 const bfd_target *
-bfd_sym_object_p (abfd)
-     bfd *abfd;
+bfd_sym_object_p (bfd *abfd)
 {
-  struct bfd_preserve preserve;
   bfd_sym_version version = -1;
+  bfd_sym_data_struct *mdata;
 
-  preserve.marker = NULL;
   bfd_seek (abfd, 0, SEEK_SET);
   if (bfd_sym_read_version (abfd, &version) != 0)
     goto wrong;
 
-  preserve.marker = bfd_alloc (abfd, sizeof (bfd_sym_data_struct));
-  if (preserve.marker == NULL
-      || ! bfd_preserve_save (abfd, &preserve))
+  mdata = (bfd_sym_data_struct *) bfd_alloc (abfd, sizeof (*mdata));
+  if (mdata == NULL)
     goto fail;
 
-  if (bfd_sym_scan (abfd, version,
-		    (bfd_sym_data_struct *) preserve.marker) != 0)
+  if (bfd_sym_scan (abfd, version, mdata) != 0)
     goto wrong;
 
-  bfd_preserve_finish (abfd, &preserve);
   return abfd->xvec;
 
  wrong:
   bfd_set_error (bfd_error_wrong_format);
 
  fail:
-  if (preserve.marker != NULL)
-    bfd_preserve_restore (abfd, &preserve);
   return NULL;
 }
 
-asymbol *
-bfd_sym_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  return (asymbol *) bfd_alloc (abfd, sizeof (asymbol));
-}
+#define bfd_sym_make_empty_symbol _bfd_generic_make_empty_symbol
 
 void
-bfd_sym_get_symbol_info (abfd, symbol, ret)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     asymbol *symbol;
-     symbol_info *ret;
+bfd_sym_get_symbol_info (bfd *abfd ATTRIBUTE_UNUSED, asymbol *symbol, symbol_info *ret)
 {
   bfd_symbol_info (symbol, ret);
 }
 
 long
-bfd_sym_get_symtab_upper_bound (abfd)
-     bfd *abfd ATTRIBUTE_UNUSED;
+bfd_sym_get_symtab_upper_bound (bfd *abfd ATTRIBUTE_UNUSED)
 {
   return 0;
 }
 
 long
-bfd_sym_canonicalize_symtab (abfd, sym)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     asymbol **sym ATTRIBUTE_UNUSED;
+bfd_sym_canonicalize_symtab (bfd *abfd ATTRIBUTE_UNUSED, asymbol **sym ATTRIBUTE_UNUSED)
 {
   return 0;
 }
 
 int
-bfd_sym_sizeof_headers (abfd, exec)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     bfd_boolean exec ATTRIBUTE_UNUSED;
+bfd_sym_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
+			struct bfd_link_info *info ATTRIBUTE_UNUSED)
 {
   return 0;
 }
 
 const bfd_target sym_vec =
 {
-  "sym",			/* name */
-  bfd_target_sym_flavour,	/* flavour */
-  BFD_ENDIAN_BIG,		/* byteorder */
-  BFD_ENDIAN_BIG,		/* header_byteorder */
-  (HAS_RELOC | EXEC_P |		/* object flags */
+  "sym",			/* Name.  */
+  bfd_target_sym_flavour,	/* Flavour.  */
+  BFD_ENDIAN_BIG,		/* Byteorder.  */
+  BFD_ENDIAN_BIG,		/* Header byteorder.  */
+  (HAS_RELOC | EXEC_P |		/* Object flags.  */
    HAS_LINENO | HAS_DEBUG |
    HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED),
   (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE | SEC_DATA
-   | SEC_ROM | SEC_HAS_CONTENTS), /* section_flags */
-  0,				/* symbol_leading_char */
-  ' ',				/* ar_pad_char */
-  16,				/* ar_max_namelen */
+   | SEC_ROM | SEC_HAS_CONTENTS), /* Section_flags.  */
+  0,				/* Symbol_leading_char.  */
+  ' ',				/* AR_pad_char.  */
+  16,				/* AR_max_namelen.  */
+  0,				/* match priority.  */
   bfd_getb64, bfd_getb_signed_64, bfd_putb64,
   bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* data */
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Data.  */
   bfd_getb64, bfd_getb_signed_64, bfd_putb64,
   bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* hdrs */
-  {				/* bfd_check_format */
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Hdrs.  */
+  {				/* bfd_check_format.  */
     _bfd_dummy_target,
-    bfd_sym_object_p,		/* bfd_check_format */
+    bfd_sym_object_p,		/* bfd_check_format.  */
     _bfd_dummy_target,
     _bfd_dummy_target,
   },
-  {				/* bfd_set_format */
-    bfd_false,
+  {				/* bfd_set_format.  */
+    _bfd_bool_bfd_false_error,
     bfd_sym_mkobject,
-    bfd_false,
-    bfd_false,
+    _bfd_bool_bfd_false_error,
+    _bfd_bool_bfd_false_error,
   },
-  {				/* bfd_write_contents */
-    bfd_false,
-    bfd_true,
-    bfd_false,
-    bfd_false,
+  {				/* bfd_write_contents.  */
+    _bfd_bool_bfd_false_error,
+    _bfd_bool_bfd_true,
+    _bfd_bool_bfd_false_error,
+    _bfd_bool_bfd_false_error,
   },
 
   BFD_JUMP_TABLE_GENERIC (bfd_sym),
@@ -2461,7 +2351,7 @@ const bfd_target sym_vec =
   BFD_JUMP_TABLE_CORE (_bfd_nocore),
   BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
   BFD_JUMP_TABLE_SYMBOLS (bfd_sym),
-  BFD_JUMP_TABLE_RELOCS (bfd_sym),
+  BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
   BFD_JUMP_TABLE_WRITE (bfd_sym),
   BFD_JUMP_TABLE_LINK (bfd_sym),
   BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
@@ -2470,4 +2360,3 @@ const bfd_target sym_vec =
 
   NULL
 };
-