mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-06-21 02:24:17 +08:00
bfd/
2007-09-17 H.J. Lu <hongjiu.lu@intel.com> PR binutils/3281 PR binutils/5037 * elf-bfd.h (elf_obj_tdata): Remove relro. * elf.c (get_program_header_size): Check info->relro instead of elf_tdata (abfd)->relro. (_bfd_elf_map_sections_to_segments): Likewise. (assign_file_positions_for_load_sections): Don't set PT_GNU_RELRO segment alignment here. (assign_file_positions_for_non_load_sections): Properly set up PT_GNU_RELRO segment for copying executable/shared library. (rewrite_elf_program_header): Remove PT_GNU_RELRO segment. (copy_elf_program_header): Set p_size and p_size_valid fields for PT_GNU_RELRO segment. include/elf/ 2007-09-17 H.J. Lu <hongjiu.lu@intel.com> PR binutils/3281 PR binutils/5037 * internal.h (elf_segment_map): Add p_size and p_size_valid. (ELF_IS_SECTION_IN_SEGMENT): Allow SHF_TLS sections in PT_GNU_RELRO segments. ld/ 2007-09-17 H.J. Lu <hongjiu.lu@intel.com> PR binutils/3281 PR binutils/5037 * ldexp.h (ldexp_control): Add relro, relro_start_stat and relro_end_stat. * ldexp.c (fold_binary): Set expld.dataseg.relro to exp_dataseg_relro_start or exp_dataseg_relro_end when seeing DATA_SEGMENT_ALIGN or DATA_SEGMENT_RELRO_END, respectively. * ldlang.c (lang_size_sections_1): Properly set expld.dataseg.relro_start_stat and expld.dataseg.relro_end_stat. (find_relro_section_callback): New function. (lang_find_relro_sections_1): Likewise. (lang_find_relro_sections): Likewise. (lang_process): Call lang_find_relro_sections for non-relocatable link. ld/testsuite/ 2007-09-17 H.J. Lu <hongjiu.lu@intel.com> PR binutils/3281 PR binutils/5037 * ld-elf/binutils.exp: Update "-z relro" tests to use relro1.s. Add "-z relro" tests with relro2.s. Add "-z relro" tests with TLS for objcopy. * ld-elf/relro1.s: New file. * ld-elf/relro2.s: Likewise.
This commit is contained in:
101
ld/ldlang.c
101
ld/ldlang.c
@ -4636,10 +4636,32 @@ lang_size_sections_1
|
||||
bfd_vma newdot = dot;
|
||||
etree_type *tree = s->assignment_statement.exp;
|
||||
|
||||
expld.dataseg.relro = exp_dataseg_relro_none;
|
||||
|
||||
exp_fold_tree (tree,
|
||||
output_section_statement->bfd_section,
|
||||
&newdot);
|
||||
|
||||
if (expld.dataseg.relro == exp_dataseg_relro_start)
|
||||
{
|
||||
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_dataseg_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_dataseg_relro_none;
|
||||
|
||||
/* This symbol is relative to this section. */
|
||||
if ((tree->type.node_class == etree_provided
|
||||
|| tree->type.node_class == etree_assign)
|
||||
@ -5665,6 +5687,81 @@ lang_gc_sections (void)
|
||||
bfd_gc_sections (output_bfd, &link_info);
|
||||
}
|
||||
|
||||
/* Worker for lang_find_relro_sections_1. */
|
||||
|
||||
static void
|
||||
find_relro_section_callback (lang_wild_statement_type *ptr ATTRIBUTE_UNUSED,
|
||||
struct wildcard_list *sec ATTRIBUTE_UNUSED,
|
||||
asection *section,
|
||||
lang_input_statement_type *file ATTRIBUTE_UNUSED,
|
||||
void *data)
|
||||
{
|
||||
/* Discarded, excluded and ignored sections effectively have zero
|
||||
size. */
|
||||
if (section->output_section != NULL
|
||||
&& section->output_section->owner == output_bfd
|
||||
&& (section->output_section->flags & SEC_EXCLUDE) == 0
|
||||
&& !IGNORE_SECTION (section)
|
||||
&& section->size != 0)
|
||||
{
|
||||
bfd_boolean *has_relro_section = (bfd_boolean *) data;
|
||||
*has_relro_section = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
/* Iterate over sections for relro sections. */
|
||||
|
||||
static void
|
||||
lang_find_relro_sections_1 (lang_statement_union_type *s,
|
||||
bfd_boolean *has_relro_section)
|
||||
{
|
||||
if (*has_relro_section)
|
||||
return;
|
||||
|
||||
for (; s != NULL; s = s->header.next)
|
||||
{
|
||||
if (s == expld.dataseg.relro_end_stat)
|
||||
break;
|
||||
|
||||
switch (s->header.type)
|
||||
{
|
||||
case lang_wild_statement_enum:
|
||||
walk_wild (&s->wild_statement,
|
||||
find_relro_section_callback,
|
||||
has_relro_section);
|
||||
break;
|
||||
case lang_constructors_statement_enum:
|
||||
lang_find_relro_sections_1 (constructor_list.head,
|
||||
has_relro_section);
|
||||
break;
|
||||
case lang_output_section_statement_enum:
|
||||
lang_find_relro_sections_1 (s->output_section_statement.children.head,
|
||||
has_relro_section);
|
||||
break;
|
||||
case lang_group_statement_enum:
|
||||
lang_find_relro_sections_1 (s->group_statement.children.head,
|
||||
has_relro_section);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
lang_find_relro_sections (void)
|
||||
{
|
||||
bfd_boolean has_relro_section = FALSE;
|
||||
|
||||
/* Check all sections in the link script. */
|
||||
|
||||
lang_find_relro_sections_1 (expld.dataseg.relro_start_stat,
|
||||
&has_relro_section);
|
||||
|
||||
if (!has_relro_section)
|
||||
link_info.relro = FALSE;
|
||||
}
|
||||
|
||||
/* Relax all sections until bfd_relax_section gives up. */
|
||||
|
||||
static void
|
||||
@ -5792,6 +5889,10 @@ lang_process (void)
|
||||
section positions, since they will affect SIZEOF_HEADERS. */
|
||||
lang_record_phdrs ();
|
||||
|
||||
/* Check relro sections. */
|
||||
if (link_info.relro && ! link_info.relocatable)
|
||||
lang_find_relro_sections ();
|
||||
|
||||
/* Size up the sections. */
|
||||
lang_size_sections (NULL, !command_line.relax);
|
||||
|
||||
|
Reference in New Issue
Block a user