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

PR 12763

Browse Source 
* elf.c (_bfd_elf_make_section_from_shdr): Set up TLS section LMAs
	from PT_TLS header.
	(_bfd_elf_map_sections_to_segments): Don't create a final PT_LOAD
	segment if just for .tbss.
	(assign_file_positions_for_load_sections): Don't report "can't
	allocate in segment" errors for .tbss.
	(assign_file_positions_for_non_load_sections): Don't set p_filesz
	from SHT_NOBITS section filepos.
This commit is contained in:
Alan Modra
2011-05-20 15:32:24 +00:00
parent e93a69ed93
commit 86b2281fde
2 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bfd/ChangeLog
View File

@ -1,3 +1,15 @@
2011-05-21 Alan Modra <amodra@gmail.com>
PR 12763
* elf.c (_bfd_elf_make_section_from_shdr): Set up TLS section LMAs
from PT_TLS header.
(_bfd_elf_map_sections_to_segments): Don't create a final PT_LOAD
segment if just for .tbss.
(assign_file_positions_for_load_sections): Don't report "can't
allocate in segment" errors for .tbss.
(assign_file_positions_for_non_load_sections): Don't set p_filesz
from SHT_NOBITS section filepos.
2011-05-20 Bernd Schmidt <bernds@codesourcery.com> 2011-05-20 Bernd Schmidt <bernds@codesourcery.com>
* elf32-tic6x.c (elf32_tic6x_howto_table): Add entries for * elf32-tic6x.c (elf32_tic6x_howto_table): Add entries for

35
bfd/elf.c
View File

@ -976,7 +976,9 @@ _bfd_elf_make_section_from_shdr (bfd *abfd,
phdr = elf_tdata (abfd)->phdr; phdr = elf_tdata (abfd)->phdr;
for (i = 0; i < elf_elfheader (abfd)->e_phnum; i++, phdr++) for (i = 0; i < elf_elfheader (abfd)->e_phnum; i++, phdr++)
{ {
if (phdr->p_type == PT_LOAD if (((phdr->p_type == PT_LOAD
&& (hdr->sh_flags & SHF_TLS) == 0)
|| phdr->p_type == PT_TLS)
&& ELF_SECTION_IN_SEGMENT (hdr, phdr)) && ELF_SECTION_IN_SEGMENT (hdr, phdr))
{ {
if ((flags & SEC_LOAD) == 0) if ((flags & SEC_LOAD) == 0)
@ -3987,8 +3989,12 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info)
phdr_in_segment = FALSE; phdr_in_segment = FALSE;
} }
/* Create a final PT_LOAD program segment. */ /* Create a final PT_LOAD program segment, but not if it's just
if (last_hdr != NULL) for .tbss. */
if (last_hdr != NULL
&& (i - phdr_index != 1
|| ((last_hdr->flags & (SEC_THREAD_LOCAL | SEC_LOAD))
!= SEC_THREAD_LOCAL)))
{ {
m = make_mapping (abfd, sections, phdr_index, i, phdr_in_segment); m = make_mapping (abfd, sections, phdr_index, i, phdr_in_segment);
if (m == NULL) if (m == NULL)
@ -4748,7 +4754,8 @@ assign_file_positions_for_load_sections (bfd *abfd,
sec = m->sections[i]; sec = m->sections[i];
this_hdr = &(elf_section_data(sec)->this_hdr); this_hdr = &(elf_section_data(sec)->this_hdr);
if (!ELF_SECTION_IN_SEGMENT_1 (this_hdr, p, check_vma, 0)) if (!ELF_SECTION_IN_SEGMENT_1 (this_hdr, p, check_vma, 0)
&& !ELF_TBSS_SPECIAL (this_hdr, p))
{ {
(*_bfd_error_handler) (*_bfd_error_handler)
(_("%B: section `%A' can't be allocated in segment %d"), (_("%B: section `%A' can't be allocated in segment %d"),
@ -4919,17 +4926,21 @@ assign_file_positions_for_non_load_sections (bfd *abfd,
&& (p->p_type != PT_NOTE && (p->p_type != PT_NOTE
|| bfd_get_format (abfd) != bfd_core)) || bfd_get_format (abfd) != bfd_core))
{ {
Elf_Internal_Shdr *hdr;
asection *sect;
BFD_ASSERT (!m->includes_filehdr && !m->includes_phdrs); BFD_ASSERT (!m->includes_filehdr && !m->includes_phdrs);
sect = m->sections[m->count - 1]; p->p_filesz = 0;
hdr = &elf_section_data (sect)->this_hdr;
p->p_filesz = sect->filepos - m->sections[0]->filepos;
if (hdr->sh_type != SHT_NOBITS)
p->p_filesz += hdr->sh_size;
p->p_offset = m->sections[0]->filepos; p->p_offset = m->sections[0]->filepos;
for (i = m->count; i-- != 0;)
{
asection *sect = m->sections[i];
Elf_Internal_Shdr *hdr = &elf_section_data (sect)->this_hdr;
if (hdr->sh_type != SHT_NOBITS)
{
p->p_filesz = (sect->filepos - m->sections[0]->filepos
+ hdr->sh_size);
break;
}
}
} }
} }
else if (m->includes_filehdr) else if (m->includes_filehdr)