Browse Source

* elf64-x86-64.c (elf64_x86_64_relocate_section): Correct test for

R_X86_64_GOTPCREL, don't use assignments instead of comparisons.
dberlin-typesystem-branch
Andreas Jaeger 26 years ago
parent
commit
6a2bda3fa0
  1. 5
      bfd/ChangeLog
  2. 10
      bfd/elf64-x86-64.c

5
bfd/ChangeLog

@ -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>
* elf64-x86-64.c (elf64_x86_64_finish_dynamic_sections): Only swap

10
bfd/elf64-x86-64.c

@ -1250,11 +1250,10 @@ elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
|| h->root.type == bfd_link_hash_defweak)
{
sec = h->root.u.def.section;
if (r_type == R_X86_64_GOTPCREL
|| (r_type = R_X86_64_PLT32
&& splt != NULL
&& h->plt.offset != (bfd_vma) -1)
|| (r_type = R_X86_64_GOT32
if ((r_type == R_X86_64_PLT32
&& splt != NULL
&& h->plt.offset != (bfd_vma) -1)
|| ((r_type == R_X86_64_GOT32 || r_type == R_X86_64_GOTPCREL)
&& elf_hash_table (info)->dynamic_sections_created
&& (!info->shared
|| (! info->symbolic && h->dynindx != -1)
@ -1408,6 +1407,7 @@ elf64_x86_64_relocate_section (output_bfd, info, input_bfd, input_section,
else
relocation = sgot->output_offset + off;
}
break;
case R_X86_64_PLT32:

Loading…
Cancel
Save