aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorRichard Henderson <rth@redhat.com>1999-07-13 20:10:26 +0000
committerRichard Henderson <rth@redhat.com>1999-07-13 20:10:26 +0000
commit28a7f3e70d035106d1c87a1b7a96bc8fc31a043a (patch)
treec2b0911a5efe8ceac6dd2ca9e2edfb2de2bf8b6e /bfd
parent3018b4415306bf86c26515447e3e519f4cf1f135 (diff)
downloadfsf-binutils-gdb-28a7f3e70d035106d1c87a1b7a96bc8fc31a043a.zip
fsf-binutils-gdb-28a7f3e70d035106d1c87a1b7a96bc8fc31a043a.tar.gz
fsf-binutils-gdb-28a7f3e70d035106d1c87a1b7a96bc8fc31a043a.tar.bz2
* elf.c (assign_file_positions_for_segments): Thinko last change.
Always overwrite p_flags.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f359ff7..230dbca 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,10 @@
1999-07-13 Richard Henderson <rth@cygnus.com>
+ * elf.c (assign_file_positions_for_segments): Thinko last change.
+ Always overwrite p_flags.
+
+1999-07-13 Richard Henderson <rth@cygnus.com>
+
* elf-bfd.h (struct elf_backend_data): Add want_dynbss.
* elflink.c (_bfd_elf_create_dynamic_sections): Only create
.dynbss and .rel[a].bss if want_dynbss.
diff --git a/bfd/elf.c b/bfd/elf.c
index b27a4b4..9291b98 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -2558,9 +2558,7 @@ assign_file_positions_for_segments (abfd)
elf_sort_sections);
p->p_type = m->p_type;
-
- if (m->p_flags_valid)
- p->p_flags |= m->p_flags;
+ p->p_flags = m->p_flags;
if (p->p_type == PT_LOAD
&& m->count > 0