espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-28 23:39:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

* elf32-spu.c (struct got_entry): Add "addend" field.

Browse Source 
(count_stub, build_stub): Use a new stub if relocation addend
	differs from existing stubs for this symbol.
	(process_stubs): Deal with addends.
	(spu_elf_relocate_section, spu_elf_output_symbol_hook): Likewise.
This commit is contained in:
Alan Modra
2008-03-03 10:03:40 +00:00
parent 451993d3c1
commit 4a628337a0
2 changed files with 52 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bfd/ChangeLog
View File

@ -1,3 +1,11 @@
2008-03-03 Alan Modra <amodra@bigpond.net.au>
* elf32-spu.c (struct got_entry): Add "addend" field.
(count_stub, build_stub): Use a new stub if relocation addend
differs from existing stubs for this symbol.
(process_stubs): Deal with addends.
(spu_elf_relocate_section, spu_elf_output_symbol_hook): Likewise.
2008-03-02 H.J. Lu <hongjiu.lu@intel.com> 2008-03-02 H.J. Lu <hongjiu.lu@intel.com>
PR ld/5789 PR ld/5789

71
bfd/elf32-spu.c
View File

@ -301,6 +301,7 @@ struct got_entry
{ {
struct got_entry *next; struct got_entry *next;
unsigned int ovl; unsigned int ovl;
bfd_vma addend;
bfd_vma stub_addr; bfd_vma stub_addr;
}; };
@ -675,6 +676,7 @@ count_stub (struct spu_link_hash_table *htab,
{ {
unsigned int ovl = 0; unsigned int ovl = 0;
struct got_entry *g, **head; struct got_entry *g, **head;
bfd_vma addend;
/* If this instruction is a branch or call, we need a stub /* If this instruction is a branch or call, we need a stub
for it. One stub per function per overlay. for it. One stub per function per overlay.
@ -699,28 +701,36 @@ count_stub (struct spu_link_hash_table *htab,
head = elf_local_got_ents (ibfd) + ELF32_R_SYM (irela->r_info); head = elf_local_got_ents (ibfd) + ELF32_R_SYM (irela->r_info);
} }
/* If we have a stub in the non-overlay area then there's no need addend = 0;
for one in overlays. */ if (irela != NULL)
g = *head; addend = irela->r_addend;
if (g != NULL && g->ovl == 0)
return TRUE;
if (ovl == 0) if (ovl == 0)
{ {
struct got_entry *gnext; struct got_entry *gnext;
/* Need a new non-overlay area stub. Zap other stubs. */ for (g = *head; g != NULL; g = g->next)
for (; g != NULL; g = gnext) if (g->addend == addend && g->ovl == 0)
break;
if (g == NULL)
{ {
htab->stub_count[g->ovl] -= 1; /* Need a new non-overlay area stub. Zap other stubs. */
gnext = g->next; for (g = *head; g != NULL; g = gnext)
free (g); {
gnext = g->next;
if (g->addend == addend)
{
htab->stub_count[g->ovl] -= 1;
free (g);
}
}
} }
} }
else else
{ {
for (; g != NULL; g = g->next) for (g = *head; g != NULL; g = g->next)
if (g->ovl == ovl) if (g->addend == addend && (g->ovl == ovl || g->ovl == 0))
break; break;
} }
@ -730,6 +740,7 @@ count_stub (struct spu_link_hash_table *htab,
if (g == NULL) if (g == NULL)
return FALSE; return FALSE;
g->ovl = ovl; g->ovl = ovl;
g->addend = addend;
g->stub_addr = (bfd_vma) -1; g->stub_addr = (bfd_vma) -1;
g->next = *head; g->next = *head;
*head = g; *head = g;
@ -768,7 +779,7 @@ build_stub (struct spu_link_hash_table *htab,
unsigned int ovl; unsigned int ovl;
struct got_entry *g, **head; struct got_entry *g, **head;
asection *sec; asection *sec;
bfd_vma val, from, to; bfd_vma addend, val, from, to;
ovl = 0; ovl = 0;
if (insn_type != non_branch) if (insn_type != non_branch)
@ -779,16 +790,19 @@ build_stub (struct spu_link_hash_table *htab,
else else
head = elf_local_got_ents (ibfd) + ELF32_R_SYM (irela->r_info); head = elf_local_got_ents (ibfd) + ELF32_R_SYM (irela->r_info);
g = *head; addend = 0;
if (g != NULL && g->ovl == 0 && ovl != 0) if (irela != NULL)
return TRUE; addend = irela->r_addend;
for (; g != NULL; g = g->next) for (g = *head; g != NULL; g = g->next)
if (g->ovl == ovl) if (g->addend == addend && (g->ovl == ovl || g->ovl == 0))
break; break;
if (g == NULL) if (g == NULL)
abort (); abort ();
if (g->ovl == 0 && ovl != 0)
return TRUE;
if (g->stub_addr != (bfd_vma) -1) if (g->stub_addr != (bfd_vma) -1)
return TRUE; return TRUE;
@ -1102,6 +1116,7 @@ process_stubs (bfd *output_bfd,
dest = h->root.u.def.value; dest = h->root.u.def.value;
else else
dest = sym->st_value; dest = sym->st_value;
dest += irela->r_addend;
if (!build_stub (htab, ibfd, isec, insn_type, h, irela, if (!build_stub (htab, ibfd, isec, insn_type, h, irela,
dest, sym_sec)) dest, sym_sec))
goto error_ret_free_internal; goto error_ret_free_internal;
@ -2774,7 +2789,7 @@ spu_elf_relocate_section (bfd *output_bfd,
head = elf_local_got_ents (input_bfd) + r_symndx; head = elf_local_got_ents (input_bfd) + r_symndx;
for (g = *head; g != NULL; g = g->next) for (g = *head; g != NULL; g = g->next)
if (g->ovl == ovl || g->ovl == 0) if (g->addend == addend && (g->ovl == ovl || g->ovl == 0))
break; break;
if (g == NULL) if (g == NULL)
abort (); abort ();
@ -2883,15 +2898,17 @@ spu_elf_output_symbol_hook (struct bfd_link_info *info,
&& h->def_regular && h->def_regular
&& strncmp (h->root.root.string, "_SPUEAR_", 8) == 0) && strncmp (h->root.root.string, "_SPUEAR_", 8) == 0)
{ {
struct got_entry *g = h->got.glist; struct got_entry *g;
if (g != NULL && g->ovl == 0) for (g = h->got.glist; g != NULL; g = g->next)
{ if (g->addend == 0 && g->ovl == 0)
sym->st_shndx = (_bfd_elf_section_from_bfd_section {
(htab->stub_sec[0]->output_section->owner, sym->st_shndx = (_bfd_elf_section_from_bfd_section
htab->stub_sec[0]->output_section)); (htab->stub_sec[0]->output_section->owner,
sym->st_value = g->stub_addr; htab->stub_sec[0]->output_section));
} sym->st_value = g->stub_addr;
break;
}
} }
return TRUE; return TRUE;