espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-20 18:08:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

ld/x86: Update -z report-relative-reloc

Browse Source 
Use 0x%v, instead of bfd_sprintf_vma, to report relative relocations.
Change linker relative relocations report from

tmpdir/dump: R_X86_64_IRELATIVE (offset: 0x0000000000002000, info: 0x0000000000000025, addend: 0x0000000000001007) against 'ifunc' for section '.data.rel.ro.local' in tmpdir/report-reloc-1.o

to

tmpdir/dump: R_X86_64_IRELATIVE (offset: 0x2000, info: 0x25, addend: 0x1007) against 'ifunc' for section '.data.rel.ro.local' in tmpdir/report-reloc-1.o

bfd/

	* elfxx-x86.c (_bfd_x86_elf_link_report_relative_reloc): Use
	0x%v instead of bfd_sprintf_vma.

ld/

	* testsuite/ld-i386/report-reloc-1.l: Updated.
	* testsuite/ld-x86-64/report-reloc-1.l: Likewise.
This commit is contained in:
H.J. Lu
2022-01-04 11:07:50 -08:00
parent 6395a10210
commit 7131d475da
3 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
bfd/elfxx-x86.c
View File

@ -1754,7 +1754,6 @@ _bfd_x86_elf_link_report_relative_reloc
const char *name; const char *name;
bfd *abfd; bfd *abfd;
const Elf_Internal_Rela *rel = (const Elf_Internal_Rela *) reloc; const Elf_Internal_Rela *rel = (const Elf_Internal_Rela *) reloc;
char r_offset[30], r_info[30];
/* Use the output BFD for linker created sections. */ /* Use the output BFD for linker created sections. */
if ((asect->flags & SEC_LINKER_CREATED) != 0) if ((asect->flags & SEC_LINKER_CREATED) != 0)
@ -1767,26 +1766,17 @@ _bfd_x86_elf_link_report_relative_reloc
else else
name = bfd_elf_sym_name (abfd, &elf_symtab_hdr (abfd), sym, NULL); name = bfd_elf_sym_name (abfd, &elf_symtab_hdr (abfd), sym, NULL);
bfd_sprintf_vma (abfd, r_offset, rel->r_offset);
bfd_sprintf_vma (abfd, r_info, rel->r_info);
if (asect->use_rela_p) if (asect->use_rela_p)
{ info->callbacks->einfo
char r_addend[30]; (_("%pB: %s (offset: 0x%v, info: 0x%v, addend: 0x%v) against "
"'%s' " "for section '%pA' in %pB\n"),
bfd_sprintf_vma (abfd, r_addend, rel->r_addend); info->output_bfd, reloc_name, rel->r_offset, rel->r_info,
rel->r_addend, name, asect, abfd);
info->callbacks->einfo
(_("%pB: %s (offset: 0x%s, info: 0x%s, addend: 0x%s) against "
"'%s' " "for section '%pA' in %pB\n"),
info->output_bfd, reloc_name, r_offset, r_info, r_addend,
name, asect, abfd);
}
else else
info->callbacks->einfo info->callbacks->einfo
(_("%pB: %s (offset: 0x%s, info: 0x%s) against '%s' for section " (_("%pB: %s (offset: 0x%v, info: 0x%v) against '%s' for section "
"'%pA' in %pB\n"), "'%pA' in %pB\n"),
info->output_bfd, reloc_name, r_offset, r_info, name, info->output_bfd, reloc_name, rel->r_offset, rel->r_info, name,
asect, abfd); asect, abfd);
} }

4
ld/testsuite/ld-i386/report-reloc-1.l
View File

@ -1,2 +1,2 @@
tmpdir/dump: R_386_IRELATIVE \(offset: 0x[0-9a-f]+, info: 0x0+2a\) against 'ifunc' for section '.data.rel.ro.local' in tmpdir/report-reloc-1.o tmpdir/dump: R_386_IRELATIVE \(offset: 0x[0-9a-f]+, info: 0x2a\) against 'ifunc' for section '.data.rel.ro.local' in tmpdir/report-reloc-1.o
tmpdir/dump: R_386_RELATIVE \(offset: 0x[0-9a-f]+, info: 0x0+8\) against '_start' for section '.data.rel.ro.local' in tmpdir/report-reloc-1.o tmpdir/dump: R_386_RELATIVE \(offset: 0x[0-9a-f]+, info: 0x8\) against '_start' for section '.data.rel.ro.local' in tmpdir/report-reloc-1.o

4
ld/testsuite/ld-x86-64/report-reloc-1.l
View File

@ -1,2 +1,2 @@
tmpdir/dump: R_X86_64_IRELATIVE \(offset: 0x[0-9a-f]+, info: 0x0+25, addend: 0x[0-9a-f]+\) against 'ifunc' for section '.data.rel.ro.local' in tmpdir/report-reloc-1.o tmpdir/dump: R_X86_64_IRELATIVE \(offset: 0x[0-9a-f]+, info: 0x25, addend: 0x[0-9a-f]+\) against 'ifunc' for section '.data.rel.ro.local' in tmpdir/report-reloc-1.o
tmpdir/dump: R_X86_64_RELATIVE \(offset: 0x[0-9a-f]+, info: 0x0+8, addend: 0x[0-9a-f]+\) against '_start' for section '.data.rel.ro.local' in tmpdir/report-reloc-1.o tmpdir/dump: R_X86_64_RELATIVE \(offset: 0x[0-9a-f]+, info: 0x8, addend: 0x[0-9a-f]+\) against '_start' for section '.data.rel.ro.local' in tmpdir/report-reloc-1.o