From 540b09cb7df7c3b34dd5dd9d8e5e6fea5d482baf Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 4 Jul 2005 10:30:09 +0000 Subject: [PATCH] PR 1042 * elf.c (assign_file_positions_for_segments): Remove excluded sections from the segment map. --- bfd/ChangeLog | 6 ++++++ bfd/elf.c | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 388c568d9f6..87d7ee4c632 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2005-07-04 Alan Modra + + PR 1042 + * elf.c (assign_file_positions_for_segments): Remove excluded + sections from the segment map. + 2005-07-04 Alan Modra PR 1004 diff --git a/bfd/elf.c b/bfd/elf.c index 5bbe6503a24..0f9b6c27b9e 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -4044,7 +4044,8 @@ assign_file_positions_for_segments (bfd *abfd, struct bfd_link_info *link_info) { /* The placement algorithm assumes that non allocated sections are not in PT_LOAD segments. We ensure this here by removing such - sections from the segment map. */ + sections from the segment map. We also remove excluded + sections. */ for (m = elf_tdata (abfd)->segment_map; m != NULL; m = m->next) @@ -4052,13 +4053,12 @@ assign_file_positions_for_segments (bfd *abfd, struct bfd_link_info *link_info) unsigned int new_count; unsigned int i; - if (m->p_type != PT_LOAD) - continue; - new_count = 0; for (i = 0; i < m->count; i ++) { - if ((m->sections[i]->flags & SEC_ALLOC) != 0) + if ((m->sections[i]->flags & SEC_EXCLUDE) == 0 + && ((m->sections[i]->flags & SEC_ALLOC) != 0 + || m->p_type != PT_LOAD)) { if (i != new_count) m->sections[new_count] = m->sections[i]; -- 2.30.2