diff options
author | Alan Modra <amodra@gmail.com> | 2022-06-22 11:55:02 +0930 |
---|---|---|
committer | Alan Modra <amodra@gmail.com> | 2022-06-22 12:37:06 +0930 |
commit | 46439c90f2000edcb300c85ed843f8930752aed5 (patch) | |
tree | 30f9245656adb00f2d5c8f3e80ff8dddb95bf796 /bfd/elf64-ppc.c | |
parent | 581db2a29bddc6d7f2fda34aa4301e070f75c609 (diff) | |
download | fsf-binutils-gdb-46439c90f2000edcb300c85ed843f8930752aed5.zip fsf-binutils-gdb-46439c90f2000edcb300c85ed843f8930752aed5.tar.gz fsf-binutils-gdb-46439c90f2000edcb300c85ed843f8930752aed5.tar.bz2 |
PowerPC64: stub debug dump
powerpc64le-linux-ld is failing the assertion in ppc_build_one_stub,
again apparently, which means a stub will overwrite the tail of a
previous stub. The difficulty with debugging these issues is that
it's not a problem with the stub that triggers the assertion, but the
previous stub in that section. This patch keeps track of the last
stub and adds a debug dump. Hopefully that will help.
* elf64-ppc.c (enum _ppc64_sec_type): Add sec_stub.
(struct _ppc64_elf_section_data): Add u.last_ent.
(dump_previous_stub): New function.
(ppc_build_one_stub): Keep track of previous stub, and dump it
when finding an overlapping stub.
Diffstat (limited to 'bfd/elf64-ppc.c')
-rw-r--r-- | bfd/elf64-ppc.c | 59 |
1 files changed, 57 insertions, 2 deletions
diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c index 6e2016c..c69b074 100644 --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c @@ -1996,7 +1996,8 @@ static const struct bfd_elf_special_section ppc64_elf_special_sections[] = enum _ppc64_sec_type { sec_normal = 0, sec_opd = 1, - sec_toc = 2 + sec_toc = 2, + sec_stub = 3 }; struct _ppc64_elf_section_data @@ -2026,6 +2027,9 @@ struct _ppc64_elf_section_data /* And the relocation addend. */ bfd_vma *add; } toc; + + /* Stub debugging. */ + struct ppc_stub_hash_entry *last_ent; } u; enum _ppc64_sec_type sec_type:2; @@ -11636,6 +11640,47 @@ get_r2off (struct bfd_link_info *info, return r2off; } +/* Debug dump. */ + +static void +dump_previous_stub (struct ppc_stub_hash_entry *stub_entry) +{ + asection *stub_sec = stub_entry->group->stub_sec; + struct _ppc64_elf_section_data *esd = ppc64_elf_section_data (stub_sec); + if (esd->sec_type == sec_stub) + { + fprintf (stderr, "Previous stub: type = "); + switch (esd->u.last_ent->type.main) + { + case ppc_stub_none: fprintf (stderr, "none"); break; + case ppc_stub_long_branch: fprintf (stderr, "long_branch"); break; + case ppc_stub_plt_branch: fprintf (stderr, "plt_branch"); break; + case ppc_stub_plt_call: fprintf (stderr, "plt_call"); break; + case ppc_stub_global_entry: fprintf (stderr, "global_entry"); break; + case ppc_stub_save_res: fprintf (stderr, "save_res"); break; + default: fprintf (stderr, "???"); break; + } + switch (esd->u.last_ent->type.sub) + { + case ppc_stub_toc: fprintf (stderr, ":toc"); break; + case ppc_stub_notoc: fprintf (stderr, ":notoc"); break; + case ppc_stub_p9notoc: fprintf (stderr, ":p9notoc"); break; + default: fprintf (stderr, ":???"); break; + } + if (esd->u.last_ent->type.r2save) + fprintf (stderr, ":r2save"); + fprintf (stderr, "\nname = %s", esd->u.last_ent->root.string); + fprintf (stderr, "\noffset = %#lx:", esd->u.last_ent->stub_offset); + for (size_t i = esd->u.last_ent->stub_offset; + i < stub_entry->stub_offset; i += 4) + { + uint32_t *p = (uint32_t *) (stub_sec->contents + i); + fprintf (stderr, " %08x", *p); + } + fprintf (stderr, "\n"); + } +} + static bool ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) { @@ -11680,7 +11725,11 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) if (htab == NULL) return false; - BFD_ASSERT (stub_entry->stub_offset >= stub_entry->group->stub_sec->size); + if (stub_entry->stub_offset < stub_entry->group->stub_sec->size) + { + BFD_ASSERT (0); + dump_previous_stub (stub_entry); + } loc = stub_entry->group->stub_sec->contents + stub_entry->stub_offset; htab->stub_count[stub_entry->type.main - 1] += 1; @@ -12122,6 +12171,12 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) } stub_entry->group->stub_sec->size = stub_entry->stub_offset + (p - loc); + struct _ppc64_elf_section_data *esd + = ppc64_elf_section_data (stub_entry->group->stub_sec); + if (esd->sec_type == sec_normal) + esd->sec_type = sec_stub; + if (esd->sec_type == sec_stub) + esd->u.last_ent = stub_entry; if (htab->params->emit_stub_syms) { |