This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[HPPA] Attach linker created dynamic sections to stub bfd
- From: Alan Modra <amodra at gmail dot com>
- To: binutils at sourceware dot org
- Date: Wed, 11 May 2016 22:50:18 +0930
- Subject: [HPPA] Attach linker created dynamic sections to stub bfd
- Authentication-results: sourceware.org; auth=none
It's nice to have dynamic sections always attached to the first bfd.
bfd/
* elf32-hppa.c (elf32_hppa_init_stub_bfd): New function.
(elf32_hppa_check_relocs): Don't set dynobj.
(elf32_hppa_size_stubs): Test !SEC_LINKER_CREATED for stub sections.
(elf32_hppa_build_stubs): Likewise.
* elf32-hppa.h (elf32_hppa_init_stub_bfd): Declare.
ld/
* emultempl/hppaelf.em (hppaelf_create_output_section_statements):
Call elf32_hppa_init_stub_bfd.
diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c
index 699d02a..d67a40e 100644
--- a/bfd/elf32-hppa.c
+++ b/bfd/elf32-hppa.c
@@ -455,6 +455,18 @@ elf32_hppa_link_hash_table_create (bfd *abfd)
return &htab->etab.root;
}
+/* Initialize the linker stubs BFD so that we can use it for linker
+ created dynamic sections. */
+
+void
+elf32_hppa_init_stub_bfd (bfd *abfd, struct bfd_link_info *info)
+{
+ struct elf32_hppa_link_hash_table *htab = hppa_link_hash_table (info);
+
+ elf_elfheader (abfd)->e_ident[EI_CLASS] = ELFCLASS32;
+ htab->etab.dynobj = abfd;
+}
+
/* Build a name for an entry in the stub hash table. */
static char *
@@ -1347,8 +1359,6 @@ elf32_hppa_check_relocs (bfd *abfd,
relocation for this entry. */
if (htab->sgot == NULL)
{
- if (htab->etab.dynobj == NULL)
- htab->etab.dynobj = abfd;
if (!elf32_hppa_create_dynamic_sections (htab->etab.dynobj, info))
return FALSE;
}
@@ -1484,9 +1494,6 @@ elf32_hppa_check_relocs (bfd *abfd,
this reloc. */
if (sreloc == NULL)
{
- if (htab->etab.dynobj == NULL)
- htab->etab.dynobj = abfd;
-
sreloc = _bfd_elf_make_dynamic_reloc_section
(sec, htab->etab.dynobj, 2, abfd, /*rela?*/ TRUE);
@@ -3071,7 +3078,8 @@ elf32_hppa_size_stubs
for (stub_sec = htab->stub_bfd->sections;
stub_sec != NULL;
stub_sec = stub_sec->next)
- stub_sec->size = 0;
+ if ((stub_sec->flags & SEC_LINKER_CREATED) == 0)
+ stub_sec->size = 0;
bfd_hash_traverse (&htab->bstab, hppa_size_one_stub, htab);
@@ -3193,16 +3201,15 @@ elf32_hppa_build_stubs (struct bfd_link_info *info)
for (stub_sec = htab->stub_bfd->sections;
stub_sec != NULL;
stub_sec = stub_sec->next)
- {
- bfd_size_type size;
-
- /* Allocate memory to hold the linker stubs. */
- size = stub_sec->size;
- stub_sec->contents = bfd_zalloc (htab->stub_bfd, size);
- if (stub_sec->contents == NULL && size != 0)
- return FALSE;
- stub_sec->size = 0;
- }
+ if ((stub_sec->flags & SEC_LINKER_CREATED) == 0
+ && stub_sec->size != 0)
+ {
+ /* Allocate memory to hold the linker stubs. */
+ stub_sec->contents = bfd_zalloc (htab->stub_bfd, stub_sec->size);
+ if (stub_sec->contents == NULL)
+ return FALSE;
+ stub_sec->size = 0;
+ }
/* Build the stubs as directed by the stub hash table. */
table = &htab->bstab;
diff --git a/bfd/elf32-hppa.h b/bfd/elf32-hppa.h
index 87ae5f1..ad5cb18 100644
--- a/bfd/elf32-hppa.h
+++ b/bfd/elf32-hppa.h
@@ -36,6 +36,9 @@
#include "libhppa.h"
#include "elf/hppa.h"
+void elf32_hppa_init_stub_bfd
+ (bfd *, struct bfd_link_info *);
+
int elf32_hppa_setup_section_lists
(bfd *, struct bfd_link_info *);
diff --git a/ld/emultempl/hppaelf.em b/ld/emultempl/hppaelf.em
index a1d2e80..965f986 100644
--- a/ld/emultempl/hppaelf.em
+++ b/ld/emultempl/hppaelf.em
@@ -88,6 +88,7 @@ hppaelf_create_output_section_statements (void)
stub_file->the_bfd->flags |= BFD_LINKER_CREATED;
ldlang_add_file (stub_file);
+ elf32_hppa_init_stub_bfd (stub_file->the_bfd, &link_info);
}
--
Alan Modra
Australia Development Lab, IBM