2004-08-04 Michael Chastain <mec.gnu@mindspring.com>

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

diff --git a/bfd/oasys.c b/bfd/oasys.c
index d1e86ca363fb516240a554ef3879d0c366fd97a3..c99919af0a966673de7a2fe8f769914cd0aa954f 100644 (file)
--- a/bfd/oasys.c
+++ b/bfd/oasys.c
@@ -1,6 +1,6 @@
 /* BFD back-end for oasys objects.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2001,
-   2002, 2003 Free Software Foundation, Inc.
+   2002, 2003, 2004 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.
@@ -70,7 +70,7 @@ static int comp
 static bfd_boolean oasys_write_object_contents
   PARAMS ((bfd *));
 static bfd_boolean oasys_set_section_contents
-  PARAMS ((bfd *, sec_ptr, void *, file_ptr, bfd_size_type));
+  PARAMS ((bfd *, sec_ptr, const void *, file_ptr, bfd_size_type));
 static asymbol *oasys_make_empty_symbol
   PARAMS ((bfd *));
 static bfd *oasys_openr_next_archived_file
@@ -324,7 +324,7 @@ oasys_archive_p (abfd)
 
   /*
     There isn't a magic number in an Oasys archive, so the best we
-    can do to verify reasnableness is to make sure that the values in
+    can do to verify reasonableness is to make sure that the values in
     the header are too weird
     */
 
@@ -507,7 +507,7 @@ oasys_object_p (abfd)
                BFD_FAIL ();
              }
 
-           s->_raw_size = H_GET_32 (abfd, record.section.value);
+           s->size = H_GET_32 (abfd, record.section.value);
            s->vma = H_GET_32 (abfd, record.section.vma);
            s->flags = 0;
            had_usefull = TRUE;
@@ -657,7 +657,7 @@ oasys_slurp_section_data (abfd)
 
            if (! per->initialized)
              {
-               per->data = (bfd_byte *) bfd_zalloc (abfd, section->_raw_size);
+               per->data = (bfd_byte *) bfd_zalloc (abfd, section->size);
                if (!per->data)
                  return FALSE;
                per->reloc_tail_ptr
@@ -1055,7 +1055,7 @@ oasys_write_sections (abfd)
          return FALSE;
        }
       out.relb = RELOCATION_TYPE_REL | s->target_index;
-      H_PUT_32 (abfd, s->_cooked_size, out.value);
+      H_PUT_32 (abfd, s->size, out.value);
       H_PUT_32 (abfd, s->vma, out.vma);
 
       if (! oasys_write_record (abfd,
@@ -1159,7 +1159,7 @@ oasys_write_data (abfd)
          current_byte_index = 0;
          processed_data.relb = s->target_index | RELOCATION_TYPE_REL;
 
-         while (current_byte_index < s->_cooked_size)
+         while (current_byte_index < s->size)
            {
              /* Scan forwards by eight bytes or however much is left and see if
               there are any relocations going on */
@@ -1180,7 +1180,7 @@ oasys_write_data (abfd)
               1 modification byte + 2 data = 8 bytes total).  That's where
               the magic number 8 comes from.
            */
-             while (current_byte_index < s->_raw_size && dst <=
+             while (current_byte_index < s->size && dst <=
                     &processed_data.data[sizeof (processed_data.data) - 8])
                {
 
@@ -1346,7 +1346,7 @@ static bfd_boolean
 oasys_set_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
      sec_ptr section;
-     PTR location;
+     const PTR location;
      file_ptr offset;
      bfd_size_type count;
 {
@@ -1355,7 +1355,7 @@ oasys_set_section_contents (abfd, section, location, offset, count)
       if (oasys_per_section (section)->data == (bfd_byte *) NULL)
        {
          oasys_per_section (section)->data =
-           (bfd_byte *) (bfd_alloc (abfd, section->_cooked_size));
+           (bfd_byte *) (bfd_alloc (abfd, section->size));
          if (!oasys_per_section (section)->data)
            return FALSE;
        }
@@ -1506,7 +1506,10 @@ oasys_sizeof_headers (abfd, exec)
 #define oasys_bfd_relax_section bfd_generic_relax_section
 #define oasys_bfd_gc_sections bfd_generic_gc_sections
 #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
+#define oasys_section_already_linked \
+  _bfd_generic_section_already_linked
 #define oasys_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
 #define oasys_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
 #define oasys_bfd_link_add_symbols _bfd_generic_link_add_symbols