resize_section_table cleanup

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

diff --git a/bfd/versados.c b/bfd/versados.c
index 8fbc17b8d3c4910fd05616a36bf72e4085c00d39..2d49458566a1568bc1971ce05bfd47713026ffce 100644 (file)
--- a/bfd/versados.c
+++ b/bfd/versados.c
@@ -1,6 +1,5 @@
 /* BFD back-end for VERSAdos-E objects.
-   Copyright 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1995-2014 Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support <sac@cygnus.com>.
 
    Versados is a Motorola trademark.
@@ -277,7 +276,9 @@ process_esd (bfd *abfd, struct ext_esd *esd, int pass)
 
        case ESD_ABS:
          size = get_4 (&ptr);
+         (void) size;
          start = get_4 (&ptr);
+         (void) start;
          break;
        case ESD_STD_REL_SEC:
        case ESD_SHRT_REL_SEC:
@@ -285,7 +286,7 @@ process_esd (bfd *abfd, struct ext_esd *esd, int pass)
          sec->flags |= SEC_ALLOC;
          break;
        case ESD_XDEF_IN_ABS:
-         sec = (asection *) & bfd_abs_section;
+         sec = bfd_abs_section_ptr;
        case ESD_XDEF_IN_SEC:
          {
            int snum = VDATA (abfd)->def_idx++;
@@ -399,9 +400,9 @@ process_otr (bfd *abfd, struct ext_otr *otr, int pass)
 
              for (j = 0; j < esdids; j++)
                {
-                 int esdid = *srcp++;
+                 int id = *srcp++;
 
-                 if (esdid)
+                 if (id)
                    {
                      int rn = EDATA (abfd, otr->esdid - 1).relocs++;
 
@@ -416,7 +417,7 @@ process_otr (bfd *abfd, struct ext_otr *otr, int pass)
                          EDATA (abfd, otr->esdid - 1).section->relocation + rn;
                          n->address = dst_idx;
 
-                         n->sym_ptr_ptr = (asymbol **) (size_t) esdid;
+                         n->sym_ptr_ptr = (asymbol **) (size_t) id;
                          n->addend = 0;
                          n->howto = versados_howto_table + ((j & 1) * 2) + (sizeinwords - 1);
                        }
@@ -766,7 +767,7 @@ versados_canonicalize_reloc (bfd *abfd,
          int esdid = (int) (size_t) src[count].sym_ptr_ptr;
 
          if (esdid == 0)
-           src[count].sym_ptr_ptr = bfd_abs_section.symbol_ptr_ptr;
+           src[count].sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
          else if (esdid < ES_BASE)
            {
              /* Section relative thing.  */
@@ -804,6 +805,7 @@ versados_canonicalize_reloc (bfd *abfd,
 #define versados_bfd_get_relocated_section_contents   bfd_generic_get_relocated_section_contents
 #define versados_bfd_relax_section                    bfd_generic_relax_section
 #define versados_bfd_gc_sections                      bfd_generic_gc_sections
+#define versados_bfd_lookup_section_flags             bfd_generic_lookup_section_flags
 #define versados_bfd_merge_sections                   bfd_generic_merge_sections
 #define versados_bfd_is_group_section                 bfd_generic_is_group_section
 #define versados_bfd_discard_group                    bfd_generic_discard_group
@@ -813,10 +815,12 @@ versados_canonicalize_reloc (bfd *abfd,
 #define versados_bfd_link_hash_table_free             _bfd_generic_link_hash_table_free
 #define versados_bfd_link_add_symbols                 _bfd_generic_link_add_symbols
 #define versados_bfd_link_just_syms                   _bfd_generic_link_just_syms
+#define versados_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
 #define versados_bfd_final_link                       _bfd_generic_final_link
 #define versados_bfd_link_split_section               _bfd_generic_link_split_section
 
-const bfd_target versados_vec =
+const bfd_target m68k_versados_vec =
 {
   "versados",                  /* Name.  */
   bfd_target_versados_flavour,
@@ -830,6 +834,7 @@ const bfd_target versados_vec =
   0,                           /* Leading underscore.  */
   ' ',                         /* 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.  */