From 6de6a7fe356bbb94c090d48366908f1eb8db6dbb Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 23 May 2011 05:41:01 +0000 Subject: PR 12763 bfd/ * elf.c (assign_file_positions_for_load_sections): Set sh_offset for .tbss, and page align same for all SHT_NOBITS sections. ld/ * ldlang.c (lang_output_section_find_by_flags): Match orphan .sdata2 like sections to existing .sdata2, and similarly for orphan TLS sections. * emultempl/elf32.em (place_orphan): Exclude .tbss from orphan_bss. --- bfd/elf.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'bfd/elf.c') diff --git a/bfd/elf.c b/bfd/elf.c index ffc9c8e..3d44ef8 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -4684,11 +4684,24 @@ assign_file_positions_for_load_sections (bfd *abfd, } else { - if (p->p_type == PT_LOAD) + if (p->p_type == PT_LOAD + || (this_hdr->sh_type == SHT_NOBITS + && (this_hdr->sh_flags & SHF_TLS) != 0 + && this_hdr->sh_offset == 0)) { - this_hdr->sh_offset = sec->filepos = off; - if (this_hdr->sh_type != SHT_NOBITS) - off += this_hdr->sh_size; + if (this_hdr->sh_type == SHT_NOBITS) + { + /* These sections don't really need sh_offset, + but give them one anyway. */ + bfd_vma adjust = vma_page_aligned_bias (this_hdr->sh_addr, + off, align); + this_hdr->sh_offset = sec->filepos = off + adjust; + } + else + { + this_hdr->sh_offset = sec->filepos = off; + off += this_hdr->sh_size; + } } if (this_hdr->sh_type != SHT_NOBITS) -- cgit v1.1