Factor stub creation code into _bfd_aarch64_create_stub_section.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 841e5a0720cd644b26adcc4f491090efa8d9513c..1a38e09a922f34a1661e94cff079c4b25bfd3322 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,11 @@
 2015-03-04  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.
+
+2015-03-23  Marcus Shawcroft  <marcus.shawcroft@arm.com>
+
        * elfnn-aarch64.c (_bfd_aarch64_create_or_find_stub_sec): Rename
        from elf_aarch64_create_or_find_stub_sec.
        (_bfd_aarch64_add_stub_entry_in_group): Rename from

diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index 9e58594f8d5c998edffd9f10044d61779f269693..b7a3bbe24a02b0c448217389a825bba310198415 100644 (file)
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -2304,6 +2304,28 @@ elfNN_aarch64_get_stub_entry (const asection *input_section,
 }
 
 
+/* Create a stub section.  */
+
+static asection *
+_bfd_aarch64_create_stub_section (asection *section,
+                                 struct elf_aarch64_link_hash_table *htab)
+{
+  size_t namelen;
+  bfd_size_type len;
+  char *s_name;
+
+  namelen = strlen (section->name);
+  len = namelen + sizeof (STUB_SUFFIX);
+  s_name = bfd_alloc (htab->stub_bfd, len);
+  if (s_name == NULL)
+    return NULL;
+
+  memcpy (s_name, section->name, namelen);
+  memcpy (s_name + namelen, STUB_SUFFIX, sizeof (STUB_SUFFIX));
+  return (*htab->add_stub_section) (s_name, section);
+}
+
+
 /* Find or create a stub section in the stub group for an input
    section.  */
 
@@ -2323,20 +2345,7 @@ _bfd_aarch64_create_or_find_stub_sec (asection *section,
       stub_sec = htab->stub_group[link_sec->id].stub_sec;
       if (stub_sec == NULL)
        {
-         size_t namelen;
-         bfd_size_type len;
-         char *s_name;
-
-         namelen = strlen (link_sec->name);
-         len = namelen + sizeof (STUB_SUFFIX);
-         s_name = bfd_alloc (htab->stub_bfd, len);
-         if (s_name == NULL)
-           return NULL;
-
-         memcpy (s_name, link_sec->name, namelen);
-         memcpy (s_name + namelen, STUB_SUFFIX, sizeof (STUB_SUFFIX));
-         stub_sec = (*htab->add_stub_section) (s_name, link_sec);
-
+         stub_sec = _bfd_aarch64_create_stub_section (link_sec, htab)
          if (stub_sec == NULL)
            return NULL;
          htab->stub_group[link_sec->id].stub_sec = stub_sec;