bfd/

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

diff --git a/bfd/oasys.c b/bfd/oasys.c
index 17714ec2078acb707becac0e4737f570cba0ca1a..1f51449abc8980a34b53ddd5a6533a76f200ac02 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, 2009 Free Software Foundation, Inc.
+   2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010
+   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;
@@ -1179,6 +1180,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