From: Alan Modra <amodra@gmail.com>
Date: Tue, 13 Oct 2015 05:48:56 +0000 (+1030)
Subject: Tidy code setting PT_GNU_RELRO p_flags
X-Git-Tag: users/ARM/embedded-binutils-2_26-branch-2016q1~437
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=341b8ee719163f7ae8528f2a7832381887fbf8d8;p=thirdparty%2Fbinutils-gdb.git

Tidy code setting PT_GNU_RELRO p_flags

No functional changes here.

	* elf.c (_bfd_elf_map_sections_to_segments): Don't set
	PT_GNU_RELRO p_flags.
	(assign_file_positions_for_non_load_sections): Set PT_GNU_RELRO
	flags to PF_R here.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index abcddc93157..6cd68de5a2b 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2015-10-13  Alan Modra  <amodra@gmail.com>
+
+	* elf.c (_bfd_elf_map_sections_to_segments): Don't set
+	PT_GNU_RELRO p_flags.
+	(assign_file_positions_for_non_load_sections): Set PT_GNU_RELRO
+	flags to PF_R here.
+
 2015-10-12  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR ld/19073
diff --git a/bfd/elf.c b/bfd/elf.c
index 6c878bdf46b..7f38fa0c62c 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -4646,9 +4646,6 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info)
 		goto error_return;
 	      m->next = NULL;
 	      m->p_type = PT_GNU_RELRO;
-	      m->p_flags = PF_R;
-	      m->p_flags_valid = 1;
-
 	      *pm = m;
 	      pm = &m->next;
 	    }
@@ -5480,7 +5477,7 @@ assign_file_positions_for_non_load_sections (bfd *abfd,
 	      if (!m->p_align_valid)
 		p->p_align = 1;
 	      if (!m->p_flags_valid)
-		p->p_flags = (lp->p_flags & ~PF_W);
+		p->p_flags = PF_R;
 	    }
 	  else
 	    {