Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Oops. Resolve conflict properly. 

The standard binutils behaviour wrt to plt entries and relocs is handled
by our dynamic linker so let's do that. Solaris does it this way too.
This commit is contained in:
skrll 2006-02-02 22:34:37 +00:00
parent ba03cd61c7
commit 97bb67a75f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/dist/binutils/bfd/elf64-sparc.c vendored
View File

@ -2797,8 +2797,13 @@ sparc64_elf_finish_dynamic_symbol (output_bfd, info, h, sym)
rela.r_offset += (splt->output_section->vma + splt->output_offset);
rela.r_info = ELF64_R_INFO (h->dynindx, R_SPARC_JMP_SLOT);
/* Adjust for the first 4 reserved elements in the .plt section
when setting the offset in the .rela.plt section.
Sun forgot to read their own ABI and copied elf32-sparc behaviour,
thus .plt[4] has corresponding .rela.plt[0] and so on. */
loc = srela->contents;
loc += h->plt.offset * sizeof (Elf64_External_Rela);
loc += (h->plt.offset - 4) * sizeof (Elf64_External_Rela);
bfd_elf64_swap_reloca_out (output_bfd, &rela, loc);
if (!h->def_regular)