diff options
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elf-nacl.c | 25 |
2 files changed, 24 insertions, 6 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index e997dc6ea5a..89a8f1b6ea0 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2013-11-19 Roland McGrath <mcgrathr@google.com> + + * elf-nacl.c (nacl_modify_segment_map): Calculate SIZEOF_HEADERS + when not doing linking (i.e. INFO is a null pointer). + 2013-11-19 H.J. Lu <hongjiu.lu@intel.com> * elf64-x86-64.c (elf_x86_64_section_from_shdr): Re-indent. diff --git a/bfd/elf-nacl.c b/bfd/elf-nacl.c index c46b4cba3b9..944aa34da36 100644 --- a/bfd/elf-nacl.c +++ b/bfd/elf-nacl.c @@ -69,18 +69,31 @@ segment_eligible_for_headers (struct elf_segment_map *seg, bfd_boolean nacl_modify_segment_map (bfd *abfd, struct bfd_link_info *info) { + const struct elf_backend_data *const bed = get_elf_backend_data (abfd); struct elf_segment_map **m = &elf_seg_map (abfd); struct elf_segment_map **first_load = NULL; struct elf_segment_map **last_load = NULL; bfd_boolean moved_headers = FALSE; - int sizeof_headers = info == NULL ? 0 : bfd_sizeof_headers (abfd, info); - bfd_vma minpagesize = get_elf_backend_data (abfd)->minpagesize; + int sizeof_headers; if (info != NULL && info->user_phdrs) /* The linker script used PHDRS explicitly, so don't change what the user asked for. */ return TRUE; + if (info != NULL) + /* We're doing linking, so evalute SIZEOF_HEADERS as in a linker script. */ + sizeof_headers = bfd_sizeof_headers (abfd, info); + else + { + /* We're not doing linking, so this is objcopy or suchlike. + We just need to collect the size of the existing headers. */ + struct elf_segment_map *seg; + sizeof_headers = bed->s->sizeof_ehdr; + for (seg = *m; seg != NULL; seg = seg->next) + sizeof_headers += bed->s->sizeof_phdr; + } + while (*m != NULL) { struct elf_segment_map *seg = *m; @@ -91,11 +104,11 @@ nacl_modify_segment_map (bfd *abfd, struct bfd_link_info *info) if (executable && seg->count > 0 - && seg->sections[0]->vma % minpagesize == 0) + && seg->sections[0]->vma % bed->minpagesize == 0) { asection *lastsec = seg->sections[seg->count - 1]; bfd_vma end = lastsec->vma + lastsec->size; - if (end % minpagesize != 0) + if (end % bed->minpagesize != 0) { /* This is an executable segment that starts on a page boundary but does not end on a page boundary. Fill @@ -136,7 +149,7 @@ nacl_modify_segment_map (bfd *abfd, struct bfd_link_info *info) in assign_file_positions_for_load_sections. */ sec->vma = end; sec->lma = lastsec->lma + lastsec->size; - sec->size = minpagesize - (end % minpagesize); + sec->size = bed->minpagesize - (end % bed->minpagesize); sec->flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE | SEC_LINKER_CREATED); sec->used_by_bfd = secdata; @@ -171,7 +184,7 @@ nacl_modify_segment_map (bfd *abfd, struct bfd_link_info *info) /* Now that we've noted the first PT_LOAD, we're looking for the first non-executable PT_LOAD with a nonempty p_filesz. */ else if (!moved_headers - && segment_eligible_for_headers (seg, minpagesize, + && segment_eligible_for_headers (seg, bed->minpagesize, sizeof_headers)) { /* This is the one we were looking for! |