diff options
Diffstat (limited to 'ld/emultempl/elf-generic.em')
| -rw-r--r-- | ld/emultempl/elf-generic.em | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/ld/emultempl/elf-generic.em b/ld/emultempl/elf-generic.em index 94486f8..d286bb8 100644 --- a/ld/emultempl/elf-generic.em +++ b/ld/emultempl/elf-generic.em @@ -1,5 +1,5 @@ # This shell script emits a C file. -*- C -*- -# Copyright 2006, 2007 Free Software Foundation, Inc. +# Copyright 2006, 2007, 2008 Free Software Foundation, Inc. # # This file is part of the GNU Binutils. # @@ -47,30 +47,34 @@ gld${EMULATION_NAME}_map_segments (bfd_boolean need_layout) need_layout = FALSE; } - if (output_bfd->xvec->flavour == bfd_target_elf_flavour + if (link_info.output_bfd->xvec->flavour == bfd_target_elf_flavour && !link_info.relocatable) { bfd_size_type phdr_size; - phdr_size = elf_tdata (output_bfd)->program_header_size; + phdr_size = elf_tdata (link_info.output_bfd)->program_header_size; /* If we don't have user supplied phdrs, throw away any previous linker generated program headers. */ if (lang_phdr_list == NULL) - elf_tdata (output_bfd)->segment_map = NULL; - if (!_bfd_elf_map_sections_to_segments (output_bfd, &link_info)) + elf_tdata (link_info.output_bfd)->segment_map = 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 (output_bfd)->program_header_size) + if (phdr_size + != elf_tdata (link_info.output_bfd)->program_header_size) { if (tries > 6) /* The first few times we allow any change to phdr_size . */ need_layout = TRUE; - else if (phdr_size < elf_tdata (output_bfd)->program_header_size) + else if (phdr_size + < elf_tdata (link_info.output_bfd)->program_header_size) /* After that we only allow the size to grow. */ need_layout = TRUE; else - elf_tdata (output_bfd)->program_header_size = phdr_size; + elf_tdata (link_info.output_bfd)->program_header_size + = phdr_size; } } } |