darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bfd/

Browse source 
* elfxx-mips.c (mips_elf_lay_out_got): Count VxWorks GOT relocs
	in g->relocs.
This commit is contained in:
Richard Sandiford 2013-02-12 09:54:56 +00:00
parent b65a2bd929
commit 57093f5e80
2 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bfd/ChangeLog
View file

@ -1,3 +1,8 @@
2013-02-12 Richard Sandiford <rdsandiford@googlemail.com>
* elfxx-mips.c (mips_elf_lay_out_got): Count VxWorks GOT relocs
in g->relocs.
2013-02-12 Alan Modra <amodra@gmail.com>
* elfxx-target.h (bfd_elfNN_bfd_link_hash_table_free): Provide

19
bfd/elfxx-mips.c
View file

@ -8649,20 +8649,7 @@ mips_elf_lay_out_got (bfd *output_bfd, struct bfd_link_info *info)
/* VxWorks does not support multiple GOTs. It initializes $gp to
__GOTT_BASE__[__GOTT_INDEX__], the value of which is set by the
dynamic loader. */
if (htab->is_vxworks)
{
/* VxWorks executables do not need a GOT. */
if (info->shared)
{
/* Each VxWorks GOT entry needs an explicit relocation. */
unsigned int count;
count = g->global_gotno + g->local_gotno - htab->reserved_gotno;
if (count)
mips_elf_allocate_dynamic_relocations (dynobj, info, count);
}
}
else if (s->size > MIPS_ELF_GOT_MAX_SIZE (info))
if (!htab->is_vxworks && s->size > MIPS_ELF_GOT_MAX_SIZE (info))
{
if (!mips_elf_multi_got (output_bfd, info, s, page_gotno))
return FALSE;
@ -8687,6 +8674,10 @@ mips_elf_lay_out_got (bfd *output_bfd, struct bfd_link_info *info)
BFD_ASSERT (g->tls_assigned_gotno
== g->global_gotno + g->local_gotno + g->tls_gotno);
/* Each VxWorks GOT entry needs an explicit relocation. */
if (htab->is_vxworks && info->shared)
g->relocs += g->global_gotno + g->local_gotno - htab->reserved_gotno;
/* Allocate room for the TLS relocations. */
if (g->relocs)
mips_elf_allocate_dynamic_relocations (dynobj, info, g->relocs);