yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ELF: Discard non-alloc sections without section header

Browse Source 
Discard non-alloc sections when section headers are stripped.

bfd/

	PR ld/25617
	* elf.c (_bfd_elf_assign_file_positions_for_non_load): Skip
	non-load sections without section header.
	(_bfd_elf_write_object_contents): Don't set the sh_name field
	without section header.  Write out the .shstrtab section only
	if its sh_offset field isn't -1.

binutils/

	PR ld/25617
	* objcopy.c (is_strip_section_1): Remove non-alloc sections for
	--strip-section-headers.

ld/

	PR ld/25617
	* ldlang.c (lang_discard_section_p): Discard non-alloc sections
	if we are stripping section headers.
This commit is contained in:
H.J. Lu 2023-05-31 12:36:49 -07:00
parent 96cc7918c1
commit 02c1ba6c94
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bfd/elf.c
View File

@ -6601,6 +6601,10 @@ _bfd_elf_assign_file_positions_for_non_load (bfd *abfd)
Elf_Internal_Ehdr *i_ehdrp;
const struct elf_backend_data *bed;
/* Skip non-load sections without section header. */
if ((abfd->flags & BFD_NO_SECTION_HEADER) != 0)
return true;
off = elf_next_file_pos (abfd);
shdrpp = elf_elfsections (abfd);
@ -6724,9 +6728,11 @@ _bfd_elf_write_object_contents (bfd *abfd)
num_sec = elf_numsections (abfd);
for (count = 1; count < num_sec; count++)
{
i_shdrp[count]->sh_name
= _bfd_elf_strtab_offset (elf_shstrtab (abfd),
i_shdrp[count]->sh_name);
/* Don't set the sh_name field without section header. */
if ((abfd->flags & BFD_NO_SECTION_HEADER) == 0)
i_shdrp[count]->sh_name
= _bfd_elf_strtab_offset (elf_shstrtab (abfd),
i_shdrp[count]->sh_name);
if (bed->elf_backend_section_processing)
if (!(*bed->elf_backend_section_processing) (abfd, i_shdrp[count]))
return false;
@ -6743,6 +6749,7 @@ _bfd_elf_write_object_contents (bfd *abfd)
/* Write out the section header names. */
t = elf_tdata (abfd);
if (elf_shstrtab (abfd) != NULL
&& t->shstrtab_hdr.sh_offset != -1
&& (bfd_seek (abfd, t->shstrtab_hdr.sh_offset, SEEK_SET) != 0
|| !_bfd_elf_strtab_emit (abfd, elf_shstrtab (abfd))))
return false;

7
binutils/objcopy.c
View File

@ -1377,6 +1377,11 @@ is_strip_section_1 (bfd *abfd ATTRIBUTE_UNUSED, asection *sec)
return true;
}
/* Remove non-alloc sections for --strip-section-headers. */
if (strip_section_headers
&& (bfd_section_flags (sec) & SEC_ALLOC) == 0)
return true;
if ((bfd_section_flags (sec) & SEC_DEBUGGING) != 0)
{
if (strip_symbols == STRIP_DEBUG
@ -2730,7 +2735,7 @@ copy_object (bfd *ibfd, bfd *obfd, const bfd_arch_info_type *input_arch)
if (strip_section_headers)
{
non_fatal (_("--strip_section_headers is unsupported on `%s'"),
non_fatal (_("--strip-section-headers is unsupported on `%s'"),
bfd_get_archive_filename (ibfd));
return false;
}

4
ld/ldlang.c
View File

@ -2538,6 +2538,10 @@ lang_discard_section_p (asection *section)
&& (flags & SEC_DEBUGGING) != 0)
discard = true;
/* Discard non-alloc sections if we are stripping section headers. */
else if (config.no_section_header && (flags & SEC_ALLOC) == 0)
discard = true;
return discard;
}