mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-12-15 04:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Re: PR16005, avr linker crash on a particular instruction sequence with --relax

Browse Source 
The last patch wasn't so clever.  The contents in fact have already
been read, just not cached where relax_delete_bytes expects them.
relax_delete_bytes also modifies relocs and syms, so they should be
cached too.

	PR 16005
	* elf32-avr.c (elf32_avr_relax_delete_bytes): Revert last change.
	(elf32_avr_relax_section): Cache contents, relocs and syms
	before calling relax_delete_bytes.
This commit is contained in:
Alan Modra 2022-07-29 22:35:13 +09:30
parent 76a4c1e063
commit 10948fb9fd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bfd/elf32-avr.c
View File

@ -1927,9 +1927,6 @@ elf32_avr_relax_delete_bytes (bfd *abfd,
symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
contents = elf_section_data (sec)->this_hdr.contents;
if (contents == NULL
&& !bfd_malloc_and_get_section (abfd, sec, &contents))
return false;
relax_info = get_avr_relax_info (sec);
toaddr = sec->size;
@ -3071,6 +3068,10 @@ elf32_avr_relax_section (bfd *abfd,
"at address 0x%x deleted.\n",
(int) dot + insn_size);
elf_section_data (sec)->relocs = internal_relocs;
elf_section_data (sec)->this_hdr.contents = contents;
symtab_hdr->contents = (unsigned char *) isymbuf;
/* Delete two bytes of data. */
if (!elf32_avr_relax_delete_bytes (abfd, sec,
irel->r_offset + insn_size, 2,