diff options
Diffstat (limited to 'ld/emultempl/elf-generic.em')
| -rw-r--r-- | ld/emultempl/elf-generic.em | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ld/emultempl/elf-generic.em b/ld/emultempl/elf-generic.em index cf4c2c82d0..2c850f1141 100644 --- a/ld/emultempl/elf-generic.em +++ b/ld/emultempl/elf-generic.em @@ -39,29 +39,27 @@ gld${EMULATION_NAME}_map_segments (bfd_boolean need_layout) { bfd_size_type phdr_size; - phdr_size = elf_tdata (link_info.output_bfd)->program_header_size; + phdr_size = elf_program_header_size (link_info.output_bfd); /* If we don't have user supplied phdrs, throw away any previous linker generated program headers. */ if (lang_phdr_list == NULL) - elf_tdata (link_info.output_bfd)->segment_map = NULL; + elf_seg_map (link_info.output_bfd) = NULL; if (!_bfd_elf_map_sections_to_segments (link_info.output_bfd, &link_info)) einfo ("%F%P: map sections to segments failed: %E\n"); - if (phdr_size - != elf_tdata (link_info.output_bfd)->program_header_size) + if (phdr_size != elf_program_header_size (link_info.output_bfd)) { if (tries > 6) /* The first few times we allow any change to phdr_size . */ need_layout = TRUE; else if (phdr_size - < elf_tdata (link_info.output_bfd)->program_header_size) + < elf_program_header_size (link_info.output_bfd)) /* After that we only allow the size to grow. */ need_layout = TRUE; else - elf_tdata (link_info.output_bfd)->program_header_size - = phdr_size; + elf_program_header_size (link_info.output_bfd) = phdr_size; } } } |