From 665856756517ff4eb0c31c07f5c7e1666ccd4445 Mon Sep 17 00:00:00 2001 From: Marcus Shawcroft Date: Tue, 10 Mar 2015 13:16:28 +0000 Subject: [PATCH] [AArch64] Factor stub creation code into _bfd_aarch64_create_stub_section. --- bfd/ChangeLog | 6 ++++++ bfd/elfnn-aarch64.c | 37 +++++++++++++++++++++++-------------- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 386cff99ee8..e281c7fe9d4 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2015-03-23 Marcus Shawcroft + + * 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 * elfnn-aarch64.c (_bfd_aarch64_create_or_find_stub_sec): Rename diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index 1db5942d309..5f80a2d7d7e 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -2327,6 +2327,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. */ @@ -2346,20 +2368,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; -- 2.30.2