aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorDaniel Jacobowitz <drow@false.org>2007-09-24 18:23:13 +0000
committerDaniel Jacobowitz <drow@false.org>2007-09-24 18:23:13 +0000
commite970b90aa90b6250b2d2c28adf596410f7c4d7b3 (patch)
tree2b65814938abbb3d22f6421c9e000046aa75d8e9 /bfd
parente5851e4e66c4404c7b3cb2fee9132fb5035bd532 (diff)
downloadbinutils-e970b90aa90b6250b2d2c28adf596410f7c4d7b3.zip
binutils-e970b90aa90b6250b2d2c28adf596410f7c4d7b3.tar.gz
binutils-e970b90aa90b6250b2d2c28adf596410f7c4d7b3.tar.bz2
* elf.c (assign_file_positions_for_load_sections): Trust
p_align_valid. (copy_elf_program_header): Copy PT_NULL segments.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elf.c8
2 files changed, 8 insertions, 6 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 42d91a7..c78cf5f 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-24 Daniel Jacobowitz <dan@codesourcery.com>
+
+ * elf.c (assign_file_positions_for_load_sections): Trust
+ p_align_valid.
+ (copy_elf_program_header): Copy PT_NULL segments.
+
2007-09-24 Trevor Smigiel <Trevor_Smigiel@playstation.sony.com>
* elf32-spu.c (is_indirect_branch): New function.
diff --git a/bfd/elf.c b/bfd/elf.c
index 379216e..3c2a49a 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -4146,10 +4146,10 @@ assign_file_positions_for_load_sections (bfd *abfd,
p->p_align = maxpagesize;
}
- else if (m->count == 0)
- p->p_align = 1 << bed->s->log_file_align;
else if (m->p_align_valid)
p->p_align = m->p_align;
+ else if (m->count == 0)
+ p->p_align = 1 << bed->s->log_file_align;
else
p->p_align = 0;
@@ -5666,10 +5666,6 @@ copy_elf_program_header (bfd *ibfd, bfd *obfd)
asection *first_section = NULL;
asection *lowest_section = NULL;
- /* FIXME: Do we need to copy PT_NULL segment? */
- if (segment->p_type == PT_NULL)
- continue;
-
/* Compute how many sections are in this segment. */
for (section = ibfd->sections, section_count = 0;
section != NULL;