aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Shawcroft <marcus.shawcroft@gmail.com>2015-03-20 20:20:35 +0000
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2015-04-17 20:24:12 +0100
commitfe388d7577dbffd2fce935dbf0a2465e2940fb61 (patch)
tree55e8ef7894f68b4258981850e55b55d1d6f0476e
parent77ee6ae7b6c64c695d09a87927c31494341817f3 (diff)
[AArch64] Factor out _bfd_aarch64_resize_stubs()
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elfnn-aarch64.c36
2 files changed, 30 insertions, 12 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1a38e09a92..c729f3754b 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,11 @@
2015-03-04 Marcus Shawcroft <marcus.shawcroft@arm.com>
+ * elfnn-aarch64.c (elfNN_aarch64_size_stubs): Factor out
+ stub resize code into...
+ (bfd_aarch64_resize_stubs): Define.
+
+2015-03-23 Marcus Shawcroft <marcus.shawcroft@arm.com>
+
* elfnn-aarch64.c (_bfd_aarch64_create_or_find_stub_sec): Factor stub
creation code into...
(bfd_aarch64_create_stub_section): Define.
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index b7a3bbe24a..49a82aab5e 100644
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -3091,6 +3091,29 @@ erratum_835769_scan (bfd *input_bfd,
return TRUE;
}
+
+/* Resize all stub sections. */
+
+static void
+_bfd_aarch64_resize_stubs (struct elf_aarch64_link_hash_table *htab)
+{
+ asection *section;
+
+ /* OK, we've added some stubs. Find out the new size of the
+ stub sections. */
+ for (section = htab->stub_bfd->sections;
+ section != NULL; section = section->next)
+ {
+ /* Ignore non-stub sections. */
+ if (!strstr (section->name, STUB_SUFFIX))
+ continue;
+ section->size = 0;
+ }
+
+ bfd_hash_traverse (&htab->stub_hash_table, aarch64_size_one_stub, htab);
+}
+
+
/* Determine and set the size of the stub section for a final link.
The basic idea here is to examine all the relocations looking for
@@ -3426,18 +3449,7 @@ elfNN_aarch64_size_stubs (bfd *output_bfd,
if (!stub_changed)
break;
- /* OK, we've added some stubs. Find out the new size of the
- stub sections. */
- for (stub_sec = htab->stub_bfd->sections;
- stub_sec != NULL; stub_sec = stub_sec->next)
- {
- /* Ignore non-stub sections. */
- if (!strstr (stub_sec->name, STUB_SUFFIX))
- continue;
- stub_sec->size = 0;
- }
-
- bfd_hash_traverse (&htab->stub_hash_table, aarch64_size_one_stub, htab);
+ _bfd_aarch64_resize_stubs (htab);
/* Add erratum 835769 veneers to stub section sizes too. */
if (htab->fix_erratum_835769)