This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
ppc32 synthetic symbol stub check
- From: Alan Modra <amodra at bigpond dot net dot au>
- To: binutils at sourceware dot org
- Date: Sat, 21 Mar 2009 13:06:44 +1030
- Subject: ppc32 synthetic symbol stub check
It's better to check that we have non-pic stubs rather than checking
that we don't have pic stubs.
* elf32-ppc.c (is_pic_glink_stub): Delete.
(is_nonpic_glink_stub): New function.
(ppc_elf_get_synthetic_symtab): Check for last non-pic stub rather
than first pic one.
(struct ppc_elf_link_hash_table <glink_pltresolve>): Comment fix.
Index: bfd/elf32-ppc.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-ppc.c,v
retrieving revision 1.252
diff -u -p -r1.252 elf32-ppc.c
--- bfd/elf32-ppc.c 4 Mar 2009 05:50:49 -0000 1.252
+++ bfd/elf32-ppc.c 20 Mar 2009 05:06:47 -0000
@@ -2328,26 +2336,17 @@ ppc_elf_final_write_processing (bfd *abf
}
static bfd_boolean
-is_pic_glink_stub (bfd *abfd, asection *glink, bfd_vma off)
+is_nonpic_glink_stub (bfd *abfd, asection *glink, bfd_vma off)
{
- bfd_byte buf[16];
- unsigned int insn;
+ bfd_byte buf[GLINK_ENTRY_SIZE];
- if (!bfd_get_section_contents (abfd, glink, buf, off, 16))
+ if (!bfd_get_section_contents (abfd, glink, buf, off, GLINK_ENTRY_SIZE))
return FALSE;
- insn = bfd_get_32 (abfd, buf);
- if ((insn & 0xffff0000) == LWZ_11_30
- && bfd_get_32 (abfd, buf + 4) == MTCTR_11
- && bfd_get_32 (abfd, buf + 8) == BCTR)
- return TRUE;
-
- if ((insn & 0xffff0000) == ADDIS_11_30
- && (bfd_get_32 (abfd, buf + 4) & 0xffff0000) == LWZ_11_11
- && bfd_get_32 (abfd, buf + 8) == MTCTR_11
- && bfd_get_32 (abfd, buf + 12) == BCTR)
- return TRUE;
- return FALSE;
+ return ((bfd_get_32 (abfd, buf + 0) & 0xffff0000) == LIS_11
+ && (bfd_get_32 (abfd, buf + 4) & 0xffff0000) == LWZ_11_11
+ && bfd_get_32 (abfd, buf + 8) == MTCTR_11
+ && bfd_get_32 (abfd, buf + 12) == BCTR);
}
static bfd_boolean
@@ -2484,10 +2483,8 @@ ppc_elf_get_synthetic_symtab (bfd *abfd,
multiple stubs for each plt entry. If that is the case then
there is no way to associate stubs with their plt entries short
of figuring out the GOT pointer value used in the stub. */
- if (!bfd_get_section_contents (abfd, glink, buf,
- stub_vma - glink->vma, 4)
- || ((bfd_get_32 (abfd, buf) & 0xffff0000) != LIS_11
- && is_pic_glink_stub (abfd, glink, stub_vma - glink->vma - 16)))
+ if (!is_nonpic_glink_stub (abfd, glink,
+ glink_vma - GLINK_ENTRY_SIZE - glink->vma))
return 0;
slurp_relocs = get_elf_backend_data (abfd)->s->slurp_reloc_table;
@@ -2722,7 +2719,7 @@ struct ppc_elf_link_hash_table
bfd_vma offset;
} tlsld_got;
- /* Offset of PltResolve function in glink. */
+ /* Offset of branch table to PltResolve function in glink. */
bfd_vma glink_pltresolve;
/* Size of reserved GOT entries. */
--
Alan Modra
Australia Development Lab, IBM