espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-12-19 01:19:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

bfd/ELF: refine PR binutils/31872 fix

Browse Source 
The fix for PR binutils/31872 (commit b20ab53f81) neglected the case
of targets with only RELA support, where nevertheless object files using
REL exist. In particular objcopy will create such objects for x86-64
when converting from an i?86 ELF object (this by itself probably isn't
quite right, but we ought to cope with what our own tools are doing).

Restore the fallback to the RELA lookup, just without re-introducing the
blind NULL de-ref that was there before.
This commit is contained in:
Jan Beulich
2024-12-19 10:39:38 +01:00
parent ec6b5cbcff
commit 2c0c13933a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bfd/elfcode.h
View File

@@ -1615,7 +1615,8 @@ elf_slurp_reloc_table_from_section (bfd *abfd,
relent->addend = rela.r_addend;
res = false;
if (entsize == sizeof (Elf_External_Rela)
if ((entsize == sizeof (Elf_External_Rela)
|| ebd->elf_info_to_howto_rel == NULL)
&& ebd->elf_info_to_howto != NULL)
res = ebd->elf_info_to_howto (abfd, relent, &rela);
else if (ebd->elf_info_to_howto_rel != NULL)