gas: detect DCTI couples in sparc

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

diff --git a/bfd/oasys.c b/bfd/oasys.c
index 9ff9b9e536fd9d41874259059de9af79a1dbc348..31555e094abb4e17f72e650230f6199c9a6a2d38 100644 (file)
--- a/bfd/oasys.c
+++ b/bfd/oasys.c
@@ -1,5 +1,5 @@
 /* BFD back-end for oasys objects.
-   Copyright (C) 1990-2014 Free Software Foundation, Inc.
+   Copyright (C) 1990-2016 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.
@@ -272,37 +272,35 @@ oasys_archive_p (bfd *abfd)
     filepos = header.mod_tbl_offset;
     for (i = 0; i < header.mod_count; i++)
       {
+       oasys_extmodule_table_type_b_type record_ext;
+
        if (bfd_seek (abfd, filepos, SEEK_SET) != 0)
          return NULL;
 
        /* There are two ways of specifying the archive header.  */
-         {
-           oasys_extmodule_table_type_b_type record_ext;
-
-           amt = sizeof (record_ext);
-           if (bfd_bread ((void *) &record_ext, amt, abfd) != amt)
-             return NULL;
-
-           record.mod_size = H_GET_32 (abfd, record_ext.mod_size);
-           record.file_offset = H_GET_32 (abfd, record_ext.file_offset);
-
-           record.dep_count = H_GET_32 (abfd, record_ext.dep_count);
-           record.depee_count = H_GET_32 (abfd, record_ext.depee_count);
-           record.sect_count = H_GET_32 (abfd, record_ext.sect_count);
-           record.module_name_size = H_GET_32 (abfd,
-                                               record_ext.mod_name_length);
-
-           amt = record.module_name_size;
-           module[i].name = bfd_alloc (abfd, amt + 1);
-           if (!module[i].name)
-             return NULL;
-           if (bfd_bread ((void *) module[i].name, amt, abfd) != amt)
-             return NULL;
-           module[i].name[record.module_name_size] = 0;
-           filepos += (sizeof (record_ext)
-                       + record.dep_count * 4
-                       + record.module_name_size + 1);
-         }
+       amt = sizeof (record_ext);
+       if (bfd_bread ((void *) &record_ext, amt, abfd) != amt)
+         return NULL;
+
+       record.mod_size = H_GET_32 (abfd, record_ext.mod_size);
+       record.file_offset = H_GET_32 (abfd, record_ext.file_offset);
+
+       record.dep_count = H_GET_32 (abfd, record_ext.dep_count);
+       record.depee_count = H_GET_32 (abfd, record_ext.depee_count);
+       record.sect_count = H_GET_32 (abfd, record_ext.sect_count);
+       record.module_name_size = H_GET_32 (abfd,
+                                           record_ext.mod_name_length);
+
+       amt = record.module_name_size;
+       module[i].name = bfd_alloc (abfd, amt + 1);
+       if (!module[i].name)
+         return NULL;
+       if (bfd_bread ((void *) module[i].name, amt, abfd) != amt)
+         return NULL;
+       module[i].name[record.module_name_size] = 0;
+       filepos += (sizeof (record_ext)
+                   + record.dep_count * 4
+                   + record.module_name_size + 1);
 
        module[i].size = record.mod_size;
        module[i].pos = record.file_offset;
@@ -1170,6 +1168,7 @@ oasys_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
 #define oasys_bfd_is_local_label_name              bfd_generic_is_local_label_name
 #define oasys_bfd_is_target_special_symbol         ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
 #define oasys_get_lineno                           _bfd_nosymbols_get_lineno
+#define oasys_get_symbol_version_string                   _bfd_nosymbols_get_symbol_version_string
 #define oasys_bfd_make_debug_symbol                _bfd_nosymbols_bfd_make_debug_symbol
 #define oasys_read_minisymbols                     _bfd_generic_read_minisymbols
 #define oasys_minisymbol_to_symbol                 _bfd_generic_minisymbol_to_symbol
@@ -1193,6 +1192,7 @@ oasys_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
   _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
+#define oasys_bfd_link_check_relocs                _bfd_generic_link_check_relocs
 
 const bfd_target oasys_vec =
 {