From: Richard Henderson <rth@redhat.com>
Date: Tue, 13 Jul 1999 20:10:26 +0000 (+0000)
Subject:         * elf.c (assign_file_positions_for_segments): Thinko last change.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=28a7f3e70d035106d1c87a1b7a96bc8fc31a043a;p=binutils-gdb.git

    * elf.c (assign_file_positions_for_segments): Thinko last change.
        Always overwrite p_flags.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f359ff7746e..230dbca30d4 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/bfd/elf.c b/bfd/elf.c
index b27a4b4f3d5..9291b9887f0 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