daily update

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

diff --git a/bfd/oasys.c b/bfd/oasys.c
index c83d3ea257bb38830ca3002337489318ee6683a4..ebb12e844e24ca5a7ffa0c35f7370ebf7385855f 100644 (file)
--- a/bfd/oasys.c
+++ b/bfd/oasys.c
@@ -1,6 +1,7 @@
 /* BFD back-end for oasys objects.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2001,
-   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011
+   Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support, <sac@cygnus.com>.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -786,7 +787,7 @@ oasys_write_syms (bfd *abfd)
 {
   unsigned int count;
   asymbol **generic = bfd_get_outsymbols (abfd);
-  unsigned int index = 0;
+  unsigned int sym_index = 0;
 
   for (count = 0; count < bfd_get_symcount (abfd); count++)
     {
@@ -799,8 +800,8 @@ oasys_write_syms (bfd *abfd)
       if (bfd_is_com_section (g->section))
        {
          symbol.relb = RELOCATION_TYPE_COM;
-         H_PUT_16 (abfd, index, symbol.refno);
-         index++;
+         H_PUT_16 (abfd, sym_index, symbol.refno);
+         sym_index++;
        }
       else if (bfd_is_abs_section (g->section))
        {
@@ -810,9 +811,9 @@ oasys_write_syms (bfd *abfd)
       else if (bfd_is_und_section (g->section))
        {
          symbol.relb = RELOCATION_TYPE_UND;
-         H_PUT_16 (abfd, index, symbol.refno);
-         /* Overload the value field with the output index number */
-         index++;
+         H_PUT_16 (abfd, sym_index, symbol.refno);
+         /* Overload the value field with the output sym_index number */
+         sym_index++;
        }
       else if (g->flags & BSF_DEBUGGING)
        /* Throw it away.  */
@@ -859,7 +860,7 @@ oasys_write_syms (bfd *abfd)
                                              name[0]) + l))
            return FALSE;
        }
-      g->value = index - 1;
+      g->value = sym_index - 1;
     }
 
   return TRUE;
@@ -905,9 +906,11 @@ oasys_write_header (bfd *abfd)
 
   if (length > (size_t) sizeof (r.module_name))
     length = sizeof (r.module_name);
+  else if (length < (size_t) sizeof (r.module_name))
+    (void) memset (r.module_name + length, ' ',
+                  sizeof (r.module_name) - length);
 
   (void) memcpy (r.module_name, abfd->filename, length);
-  (void) memset (r.module_name + length, ' ', sizeof (r.module_name) - length);
 
   r.version_number = OASYS_VERSION_NUMBER;
   r.rev_number = OASYS_REV_NUMBER;
@@ -1084,12 +1087,12 @@ static asymbol *
 oasys_make_empty_symbol (bfd *abfd)
 {
   bfd_size_type amt = sizeof (oasys_symbol_type);
-  oasys_symbol_type *new = bfd_zalloc (abfd, amt);
+  oasys_symbol_type *new_symbol_type = bfd_zalloc (abfd, amt);
 
-  if (!new)
+  if (!new_symbol_type)
     return NULL;
-  new->symbol.the_bfd = abfd;
-  return &new->symbol;
+  new_symbol_type->symbol.the_bfd = abfd;
+  return &new_symbol_type->symbol;
 }
 
 /* User should have checked the file flags; perhaps we should return
@@ -1179,6 +1182,7 @@ oasys_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
 #define oasys_truncate_arname                      bfd_dont_truncate_arname
 #define oasys_write_armap                          ((bfd_boolean (*) (bfd *, unsigned int, struct orl *, unsigned int, int)) bfd_true)
 #define oasys_read_ar_hdr                          bfd_nullvoidptr
+#define oasys_write_ar_hdr ((bfd_boolean (*) (bfd *, bfd *)) bfd_false)
 #define oasys_get_elt_at_index                     _bfd_generic_get_elt_at_index
 #define oasys_update_armap_timestamp               bfd_true
 #define oasys_bfd_is_local_label_name              bfd_generic_is_local_label_name
@@ -1194,6 +1198,7 @@ oasys_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
 #define oasys_bfd_get_relocated_section_contents   bfd_generic_get_relocated_section_contents
 #define oasys_bfd_relax_section                    bfd_generic_relax_section
 #define oasys_bfd_gc_sections                      bfd_generic_gc_sections
+#define oasys_bfd_lookup_section_flags             bfd_generic_lookup_section_flags
 #define oasys_bfd_merge_sections                   bfd_generic_merge_sections
 #define oasys_bfd_is_group_section                 bfd_generic_is_group_section
 #define oasys_bfd_discard_group                    bfd_generic_discard_group
@@ -1203,6 +1208,8 @@ oasys_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
 #define oasys_bfd_link_hash_table_free             _bfd_generic_link_hash_table_free
 #define oasys_bfd_link_add_symbols                 _bfd_generic_link_add_symbols
 #define oasys_bfd_link_just_syms                   _bfd_generic_link_just_syms
+#define oasys_bfd_copy_link_hash_symbol_type \
+  _bfd_generic_copy_link_hash_symbol_type
 #define oasys_bfd_final_link                       _bfd_generic_final_link
 #define oasys_bfd_link_split_section               _bfd_generic_link_split_section
 
@@ -1220,6 +1227,7 @@ const bfd_target oasys_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.  */