OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ld: Add ldlang_check_relro_region/update lang_find_relro_sections_1

Browse Source 
Extract GNU_RELRO region check into a new funtion and pass a pointer to
seg_align_type to lang_find_relro_sections_1 so that they can also be
used for text-only LOAD segment.

	* ldlang.c (lang_size_sections_1): Extract GNU_RELRO region check
	into ...
	(ldlang_check_relro_region): New function.
	(lang_find_relro_sections_1): Add an argument for pointer to
	seg_align_type and replace expld.dataseg with the pointer.
	(lang_find_relro_sections): Pass address of expld.dataseg to
	lang_find_relro_sections_1.
This commit is contained in:
H.J. Lu 2017-11-11 07:02:30 -08:00
parent f4d18a5466
commit ed1794ee7a
1 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
ld/ldlang.c
View File

@ -4975,6 +4975,30 @@ os_region_check (lang_output_section_statement_type *os,
} }
} }
static void
ldlang_check_relro_region (lang_statement_union_type *s,
seg_align_type *seg)
{
if (seg->relro == exp_seg_relro_start)
{
if (!seg->relro_start_stat)
seg->relro_start_stat = s;
else
{
ASSERT (seg->relro_start_stat == s);
}
}
else if (seg->relro == exp_seg_relro_end)
{
if (!seg->relro_end_stat)
seg->relro_end_stat = s;
else
{
ASSERT (seg->relro_end_stat == s);
}
}
}
/* Set the sizes for all the output sections. */ /* Set the sizes for all the output sections. */
static bfd_vma static bfd_vma
@ -5432,24 +5456,8 @@ lang_size_sections_1
output_section_statement->bfd_section, output_section_statement->bfd_section,
&newdot); &newdot);
if (expld.dataseg.relro == exp_seg_relro_start) ldlang_check_relro_region (s, &expld.dataseg);
{
if (!expld.dataseg.relro_start_stat)
expld.dataseg.relro_start_stat = s;
else
{
ASSERT (expld.dataseg.relro_start_stat == s);
}
}
else if (expld.dataseg.relro == exp_seg_relro_end)
{
if (!expld.dataseg.relro_end_stat)
expld.dataseg.relro_end_stat = s;
else
{
ASSERT (expld.dataseg.relro_end_stat == s);
}
}
expld.dataseg.relro = exp_seg_relro_none; expld.dataseg.relro = exp_seg_relro_none;
/* This symbol may be relative to this section. */ /* This symbol may be relative to this section. */
@ -6859,6 +6867,7 @@ find_relro_section_callback (lang_wild_statement_type *ptr ATTRIBUTE_UNUSED,
static void static void
lang_find_relro_sections_1 (lang_statement_union_type *s, lang_find_relro_sections_1 (lang_statement_union_type *s,
seg_align_type *seg,
bfd_boolean *has_relro_section) bfd_boolean *has_relro_section)
{ {
if (*has_relro_section) if (*has_relro_section)
@ -6866,7 +6875,7 @@ lang_find_relro_sections_1 (lang_statement_union_type *s,
for (; s != NULL; s = s->header.next) for (; s != NULL; s = s->header.next)
{ {
if (s == expld.dataseg.relro_end_stat) if (s == seg->relro_end_stat)
break; break;
switch (s->header.type) switch (s->header.type)
@ -6878,15 +6887,15 @@ lang_find_relro_sections_1 (lang_statement_union_type *s,
break; break;
case lang_constructors_statement_enum: case lang_constructors_statement_enum:
lang_find_relro_sections_1 (constructor_list.head, lang_find_relro_sections_1 (constructor_list.head,
has_relro_section); seg, has_relro_section);
break; break;
case lang_output_section_statement_enum: case lang_output_section_statement_enum:
lang_find_relro_sections_1 (s->output_section_statement.children.head, lang_find_relro_sections_1 (s->output_section_statement.children.head,
has_relro_section); seg, has_relro_section);
break; break;
case lang_group_statement_enum: case lang_group_statement_enum:
lang_find_relro_sections_1 (s->group_statement.children.head, lang_find_relro_sections_1 (s->group_statement.children.head,
has_relro_section); seg, has_relro_section);
break; break;
default: default:
break; break;
@ -6902,7 +6911,7 @@ lang_find_relro_sections (void)
/* Check all sections in the link script. */ /* Check all sections in the link script. */
lang_find_relro_sections_1 (expld.dataseg.relro_start_stat, lang_find_relro_sections_1 (expld.dataseg.relro_start_stat,
&has_relro_section); &expld.dataseg, &has_relro_section);
if (!has_relro_section) if (!has_relro_section)
link_info.relro = FALSE; link_info.relro = FALSE;