diff options
| author | Alan Modra <amodra@gmail.com> | 2019-10-23 17:40:51 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2019-10-25 13:30:05 +1030 |
| commit | 30fe183248b2523ecff9da36853e2f893c4c4b91 (patch) | |
| tree | 3f65ea3d49d3ed120a2ed8ef92e4ef8657321a25 /bfd/elf-nacl.c | |
| parent | c0c121b01c8a9408ae22ee9007dd0273f4c8d0be (diff) | |
| download | binutils-30fe183248b2523ecff9da36853e2f893c4c4b91.zip binutils-30fe183248b2523ecff9da36853e2f893c4c4b91.tar.gz binutils-30fe183248b2523ecff9da36853e2f893c4c4b91.tar.bz2 | |
PR4499, assign file positions assumes segment offsets increasing
This rewrites much of assign_file_positions_for_non_load_sections to
allow objcopy and strip to handle cases like that in PR4499 where
program headers were not in their usual position immediately after the
ELF file header, and PT_LOAD headers were not sorted by paddr.
PR 4499
include/
* elf/internal.h (struct elf_segment_map): Delete header_size.
Add no_sort_lma and idx.
bfd/
* elf-nacl.c (nacl_modify_segment_map): Set no_sort_lma for all
PT_LOAD segments.
* elf32-spu.c (spu_elf_modify_segment_map): Likewise on overlay
PT_LOAD segments.
* elf.c (elf_sort_segments): New function.
(assign_file_positions_except_relocs): Use shortcuts to elfheader
and elf_tdata. Seek to e_phoff not sizeof_ehdr to write program
headers. Move PT_PHDR check..
(assign_file_positions_for_non_load_sections): ..and code setting
PT_PHDR p_vaddr and p_paddr, and code setting __ehdr_start value..
(assign_file_positions_for_load_sections): ..to here. Sort
PT_LOAD headers. Delete header_pad code. Use actual number of
headers rather than allocated in calculating size for program
headers. Don't assume program headers follow ELF file header.
Simplify pt_load_count code. Only set "off" for PT_LOAD or
PT_NOTE in cores.
(rewrite_elf_program_header): Set p_vaddr_offset for segments
that include file and program headers.
(copy_elf_program_header): Likewise, replacing header_size code.
Diffstat (limited to 'bfd/elf-nacl.c')
| -rw-r--r-- | bfd/elf-nacl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bfd/elf-nacl.c b/bfd/elf-nacl.c index 58eebf6..ddac3b3 100644 --- a/bfd/elf-nacl.c +++ b/bfd/elf-nacl.c @@ -197,6 +197,7 @@ nacl_modify_segment_map (bfd *abfd, struct bfd_link_info *info) included the file header and phdrs. */ seg->includes_filehdr = 0; seg->includes_phdrs = 0; + seg->no_sort_lma = 1; /* Also strip out empty segments. */ if (seg->count == 0) { |