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.
This commit is contained in:
Alan Modra 2015-10-13 16:18:56 +10:30
parent 8173c2a3c4
commit 341b8ee719
2 changed files with 8 additions and 4 deletions

View File

@ -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

View File

@ -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
{