Commit 58140105 authored by Roland McGrath's avatar Roland McGrath

Fix *-nacl* target objcopy/strip of binary made with custom linker script

bfd/
	* elf-nacl.c (nacl_modify_segment_map): Calculate SIZEOF_HEADERS
	when not doing linking (i.e. INFO is a null pointer).

(cherry picked from commit 33aa641a5d20d54adaac9b21b5a3e19b03f0bd4f)
parent b429d869
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-18 Tristan Gingold <gingold@adacore.com> 2013-11-18 Tristan Gingold <gingold@adacore.com>
* configure.in: Bump version to 2.23.91 * configure.in: Bump version to 2.23.91
......
...@@ -69,18 +69,31 @@ segment_eligible_for_headers (struct elf_segment_map *seg, ...@@ -69,18 +69,31 @@ segment_eligible_for_headers (struct elf_segment_map *seg,
bfd_boolean bfd_boolean
nacl_modify_segment_map (bfd *abfd, struct bfd_link_info *info) 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 **m = &elf_seg_map (abfd);
struct elf_segment_map **first_load = NULL; struct elf_segment_map **first_load = NULL;
struct elf_segment_map **last_load = NULL; struct elf_segment_map **last_load = NULL;
bfd_boolean moved_headers = FALSE; bfd_boolean moved_headers = FALSE;
int sizeof_headers = info == NULL ? 0 : bfd_sizeof_headers (abfd, info); int sizeof_headers;
bfd_vma minpagesize = get_elf_backend_data (abfd)->minpagesize;
if (info != NULL && info->user_phdrs) if (info != NULL && info->user_phdrs)
/* The linker script used PHDRS explicitly, so don't change what the /* The linker script used PHDRS explicitly, so don't change what the
user asked for. */ user asked for. */
return TRUE; 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) while (*m != NULL)
{ {
struct elf_segment_map *seg = *m; struct elf_segment_map *seg = *m;
...@@ -91,11 +104,11 @@ nacl_modify_segment_map (bfd *abfd, struct bfd_link_info *info) ...@@ -91,11 +104,11 @@ nacl_modify_segment_map (bfd *abfd, struct bfd_link_info *info)
if (executable if (executable
&& seg->count > 0 && seg->count > 0
&& seg->sections[0]->vma % minpagesize == 0) && seg->sections[0]->vma % bed->minpagesize == 0)
{ {
asection *lastsec = seg->sections[seg->count - 1]; asection *lastsec = seg->sections[seg->count - 1];
bfd_vma end = lastsec->vma + lastsec->size; 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 /* This is an executable segment that starts on a page
boundary but does not end on a page boundary. Fill 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) ...@@ -136,7 +149,7 @@ nacl_modify_segment_map (bfd *abfd, struct bfd_link_info *info)
in assign_file_positions_for_load_sections. */ in assign_file_positions_for_load_sections. */
sec->vma = end; sec->vma = end;
sec->lma = lastsec->lma + lastsec->size; 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->flags = (SEC_ALLOC | SEC_LOAD
| SEC_READONLY | SEC_CODE | SEC_LINKER_CREATED); | SEC_READONLY | SEC_CODE | SEC_LINKER_CREATED);
sec->used_by_bfd = secdata; sec->used_by_bfd = secdata;
...@@ -171,7 +184,7 @@ nacl_modify_segment_map (bfd *abfd, struct bfd_link_info *info) ...@@ -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 /* Now that we've noted the first PT_LOAD, we're looking for
the first non-executable PT_LOAD with a nonempty p_filesz. */ the first non-executable PT_LOAD with a nonempty p_filesz. */
else if (!moved_headers else if (!moved_headers
&& segment_eligible_for_headers (seg, minpagesize, && segment_eligible_for_headers (seg, bed->minpagesize,
sizeof_headers)) sizeof_headers))
{ {
/* This is the one we were looking for! /* This is the one we were looking for!
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment