Use _bfd_aarch64_add_stub_entry_in_group.

Adjust the 835769 workaround code to use
_bfd_aarch64_add_stub_entry_in_group rather than inspect the
underlying section_group structure directly.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f435dfb792c7e2e2f23aa92fd6f8ac998881676f..31a9af705dc340a4425fc62310ab4aff7e44b28d 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-24  Marcus Shawcroft  <marcus.shawcroft@arm.com>
+
+       * elfnn-aarch64.c (elfNN_aarch64_size_stubs): Use
+       _bfd_aarch64_add_stub_entry_in_group.
+
 2015-03-23  Keith Seitz  <keiths@redhat.com>
 
        * elfnn-aarch64.c (_bfd_aarch64_create_or_find_stub_sec): Add

diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index 410cb7e6eda3909f4c964c3eb41d3b7002f99671..b10009fff776e1a706b023e7c8f786f9cf4be87d 100644 (file)
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -3481,23 +3481,13 @@ elfNN_aarch64_size_stubs (bfd *output_bfd,
          struct elf_aarch64_stub_hash_entry *stub_entry;
          char *stub_name = erratum_835769_fixes[i].stub_name;
          asection *section = erratum_835769_fixes[i].section;
-         unsigned int section_id = erratum_835769_fixes[i].section->id;
-         asection *link_sec = htab->stub_group[section_id].link_sec;
-         asection *stub_sec = htab->stub_group[section_id].stub_sec;
 
-         stub_entry = aarch64_stub_hash_lookup (&htab->stub_hash_table,
-                                                stub_name, TRUE, FALSE);
-         if (stub_entry == NULL)
-           {
-             (*_bfd_error_handler) (_("%s: cannot create stub entry %s"),
-                                    section->owner,
-                                    stub_name);
-             return FALSE;
-           }
+         stub_entry = _bfd_aarch64_add_stub_entry_in_group (stub_name,
+                                                            section,
+                                                            htab);
+         if (! stub_entry)
+           return FALSE;
 
-         stub_entry->stub_sec = stub_sec;
-         stub_entry->stub_offset = 0;
-         stub_entry->id_sec = link_sec;
          stub_entry->stub_type = erratum_835769_fixes[i].stub_type;
          stub_entry->target_section = section;
          stub_entry->target_value = erratum_835769_fixes[i].offset;