From 2d924fd9ebc6a97f9ef93208597e563c88f5e9e8 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 13 Aug 2008 07:37:46 +0000 Subject: * layout.cc (Layout::attach_allocated_section_to_segment): Don't set tls_segment_ or relro_segment_. (Layout::make_output_segment): Set tls_segment_ and relro_segment_ when appropriate. * output.h (Output_section::clear_is_relro): New function. * output.cc (Output_segment::add_output_section): Handle SHF_TLS sections specially even when output_data_ is empty. (Output_segment::maximum_alignment): When first section is relro, only force alignment for PT_LOAD segments. * script.cc (script_data_segment_align): New function. (script_data_segment_relro_end): New function. * script-c.h (script_data_segment_align): Declare. (script_data_segment_relro_end): Declare. * script-sections.h (class Script_sections): Declare data_segment_align and data_segment_relro_end. Add fields segment_align_index_ and saw_relro_end_. * script-sections.cc (class Sections_element): Add set_is_relro virtual function. Add new bool* parameter to place_orphan_here. Add get_output_section virtual function. (class Output_section_definition): Add set_is_relro. Add new bool* parameter to place_orphan_here. Add get_output_section. Add is_relro_ field. (Output_section_definition::Output_section_definition): Initialize evaluated_address_, evaluated_load_address, evaluated_addralign_, and is_relro_ fields. (Output_section_definition::place_orphan_here): Add is_relro parameter. (Output_section_definition::set_section_addresses): Set relro for output section. (Output_section_definition::alternate_constraint): Likewise. (class Orphan_output_section): Add new bool* parameter to place_orphan_here. Add get_output_section. (Orphan_output_section::place_orphan_here): Add is_relro parameter. (Script_sections::Script_sections): Initialize data_segment_align_index_ and saw_relro_end_. (Script_sections::data_segment_align): New function. (Script_sections::data_segment_relro_end): New function. (Script_sections::place_orphan): Set or clear is_relro. (Script_sections::set_section_addresses): Force alignment of first TLS section. * yyscript.y (exp): Call script_data_segment_align and script_data_segment_relro_end. * testsuite/relro_script_test.t: New file. * testsuite/relro_test.cc (using_script): Declare. (t1, t2): Test using_script. * testsuite/Makefile.am (check_PROGRAMS): Add relro_script_test. (relro_script_test_SOURCES): Define. (relro_script_test_DEPENDENCIES): Define. (relro_script_test_LDFLAGS): Define. (relro_script_test_LDADD): Define. (relro_script_test.so): New target. * testsuite/Makefile.in: Rebuild. --- gold/script.cc | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gold/script.cc') diff --git a/gold/script.cc b/gold/script.cc index f6e4a39..53fcf66 100644 --- a/gold/script.cc +++ b/gold/script.cc @@ -2400,6 +2400,34 @@ script_add_input_section(void* closurev, closure->script_options()->script_sections()->add_input_section(spec, keep); } +// When we see DATA_SEGMENT_ALIGN we record that following output +// sections may be relro. + +extern "C" void +script_data_segment_align(void* closurev) +{ + Parser_closure* closure = static_cast(closurev); + if (!closure->script_options()->saw_sections_clause()) + gold_error(_("%s:%d:%d: DATA_SEGMENT_ALIGN not in SECTIONS clause"), + closure->filename(), closure->lineno(), closure->charpos()); + else + closure->script_options()->script_sections()->data_segment_align(); +} + +// When we see DATA_SEGMENT_RELRO_END we know that all output sections +// since DATA_SEGMENT_ALIGN should be relro. + +extern "C" void +script_data_segment_relro_end(void* closurev) +{ + Parser_closure* closure = static_cast(closurev); + if (!closure->script_options()->saw_sections_clause()) + gold_error(_("%s:%d:%d: DATA_SEGMENT_ALIGN not in SECTIONS clause"), + closure->filename(), closure->lineno(), closure->charpos()); + else + closure->script_options()->script_sections()->data_segment_relro_end(); +} + // Create a new list of string/sort pairs. extern "C" String_sort_list_ptr -- cgit v1.1