* elf64-x86-64.c (elf64_x86_64_relocate_section): Correct test for
R_X86_64_GOTPCREL, don't use assignments instead of comparisons.
This commit is contained in:
parent
35714f2a5d
commit
6a2bda3fa0
|
@ -1,3 +1,8 @@
|
||||||
|
2001-04-30 Andreas Jaeger <aj@suse.de>, Andreas Schwab <schwab@suse.de>
|
||||||
|
|
||||||
|
* elf64-x86-64.c (elf64_x86_64_relocate_section): Correct test for
|
||||||
|
R_X86_64_GOTPCREL, don't use assignments instead of comparisons.
|
||||||
|
|
||||||
2001-04-27 Andreas Jaeger <aj@suse.de>
|
2001-04-27 Andreas Jaeger <aj@suse.de>
|
||||||
|
|
||||||
* elf64-x86-64.c (elf64_x86_64_finish_dynamic_sections): Only swap
|
* elf64-x86-64.c (elf64_x86_64_finish_dynamic_sections): Only swap
|
||||||
|
|
|
@ -1250,11 +1250,10 @@ elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
|
||||||
|| h->root.type == bfd_link_hash_defweak)
|
|| h->root.type == bfd_link_hash_defweak)
|
||||||
{
|
{
|
||||||
sec = h->root.u.def.section;
|
sec = h->root.u.def.section;
|
||||||
if (r_type == R_X86_64_GOTPCREL
|
if ((r_type == R_X86_64_PLT32
|
||||||
|| (r_type = R_X86_64_PLT32
|
|
||||||
&& splt != NULL
|
&& splt != NULL
|
||||||
&& h->plt.offset != (bfd_vma) -1)
|
&& h->plt.offset != (bfd_vma) -1)
|
||||||
|| (r_type = R_X86_64_GOT32
|
|| ((r_type == R_X86_64_GOT32 || r_type == R_X86_64_GOTPCREL)
|
||||||
&& elf_hash_table (info)->dynamic_sections_created
|
&& elf_hash_table (info)->dynamic_sections_created
|
||||||
&& (!info->shared
|
&& (!info->shared
|
||||||
|| (! info->symbolic && h->dynindx != -1)
|
|| (! info->symbolic && h->dynindx != -1)
|
||||||
|
@ -1408,6 +1407,7 @@ elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
|
||||||
else
|
else
|
||||||
relocation = sgot->output_offset + off;
|
relocation = sgot->output_offset + off;
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case R_X86_64_PLT32:
|
case R_X86_64_PLT32:
|
||||||
|
|
Loading…
Reference in New Issue