bfd/

[deliverable/binutils-gdb.git] / ld / emultempl / elf-generic.em

diff --git a/ld/emultempl/elf-generic.em b/ld/emultempl/elf-generic.em
index cf4c2c82d04b37607720a9e4867227b8a577e85c..2c850f1141b357ffb81f23471183f55db303109a 100644 (file)
--- 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;
            }
        }
     }