* elf.c (assign_file_positions_for_segments): Thinko last change.

        Always overwrite p_flags.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f359ff7746e8d48b0598c16364944fcbb2c2e4a5..230dbca30d475a511b45d3ee23006134c5f7f14d 100644 (file)
--- 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 b27a4b4f3d597c1002f601e16a731d1a22e82fe1..9291b9887f03fc75569be4bb2e493711a0835224 100644 (file)
--- 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