X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=bfd%2Fvms.c;h=f6d3c1a7f542d0fa888055575a8db5ba8013491a;hb=80fccad2d4ce82a2ed9a5d8d081eb2daefa09f9d;hp=175dae0eba7194137aa561790d022beae9f8bec8;hpb=1049f94e8e1a9eae86a694d2dca94a6194f763b1;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/vms.c b/bfd/vms.c
index 175dae0eba..f6d3c1a7f5 100644
--- a/bfd/vms.c
+++ b/bfd/vms.c
@@ -1,6 +1,6 @@
 /* vms.c -- BFD back-end for VAX (openVMS/VAX) and
    EVAX (openVMS/Alpha) files.
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
 
    Written by Klaus K"ampf (kkaempf@rmi.de)
@@ -95,7 +95,7 @@ static int vms_generic_stat_arch_elt
   PARAMS ((bfd *, struct stat *));
 static long vms_get_symtab_upper_bound
   PARAMS ((bfd *abfd));
-static long vms_get_symtab
+static long vms_canonicalize_symtab
   PARAMS ((bfd *abfd, asymbol **symbols));
 static void vms_print_symbol
   PARAMS ((bfd *abfd, PTR file, asymbol *symbol, bfd_print_symbol_type how));
@@ -125,7 +125,7 @@ static const struct reloc_howto_struct *vms_bfd_reloc_type_lookup
 static bfd_boolean vms_set_arch_mach
   PARAMS ((bfd *abfd, enum bfd_architecture arch, unsigned long mach));
 static bfd_boolean vms_set_section_contents
-  PARAMS ((bfd *abfd, asection *section, PTR location, file_ptr offset,
+  PARAMS ((bfd *abfd, asection *section, const PTR location, file_ptr offset,
 	   bfd_size_type count));
 static int vms_sizeof_headers
   PARAMS ((bfd *abfd, bfd_boolean reloc));
@@ -154,6 +154,7 @@ static long vms_get_dynamic_symtab_upper_bound
   PARAMS ((bfd *abfd));
 static long vms_canonicalize_dynamic_symtab
   PARAMS ((bfd *abfd, asymbol **symbols));
+#define vms_get_synthetic_symtab _bfd_nodynamic_get_synthetic_symtab
 static long vms_get_dynamic_reloc_upper_bound
   PARAMS ((bfd *abfd));
 static long vms_canonicalize_dynamic_reloc
@@ -165,7 +166,10 @@ static bfd_boolean vms_bfd_set_private_flags
 
 #define vms_make_empty_symbol _bfd_generic_make_empty_symbol
 #define vms_bfd_link_just_syms _bfd_generic_link_just_syms
+#define vms_bfd_is_group_section bfd_generic_is_group_section
 #define vms_bfd_discard_group bfd_generic_discard_group
+#define vms_bfd_copy_private_header_data \
+  _bfd_generic_bfd_copy_private_header_data
 
 /*===========================================================================*/
 
@@ -1065,7 +1069,7 @@ vms_get_symtab_upper_bound (abfd)
 
 /* Copy symbols from hash table to symbol vector
 
-   called from bfd_hash_traverse in vms_get_symtab
+   called from bfd_hash_traverse in vms_canonicalize_symtab
    init counter to 0 if entry == 0  */
 
 static bfd_boolean
@@ -1089,12 +1093,12 @@ copy_symbols (entry, arg)
    return # of symbols read  */
 
 static long
-vms_get_symtab (abfd, symbols)
+vms_canonicalize_symtab (abfd, symbols)
      bfd *abfd;
      asymbol **symbols;
 {
 #if VMS_DEBUG
-  vms_debug (1, "vms_get_symtab(%p, <ret>)\n", abfd);
+  vms_debug (1, "vms_canonicalize_symtab(%p, <ret>)\n", abfd);
 #endif
 
 	/* init counter */
@@ -1659,7 +1663,7 @@ static bfd_boolean
 vms_set_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      asection *section;
-     PTR location;
+     const PTR location;
      file_ptr offset;
      bfd_size_type count;
 {