diff options
author | Ian Lance Taylor <ian@airs.com> | 2008-08-13 07:37:46 +0000 |
---|---|---|
committer | Ian Lance Taylor <ian@airs.com> | 2008-08-13 07:37:46 +0000 |
commit | 2d924fd9ebc6a97f9ef93208597e563c88f5e9e8 (patch) | |
tree | ecbfc504dee9ce3475f988e5bce567d070e0c0c1 /gold/yyscript.y | |
parent | 9e9a97982d36c9b5e6b3d79ecbaf68041981e23b (diff) | |
download | fsf-binutils-gdb-2d924fd9ebc6a97f9ef93208597e563c88f5e9e8.zip fsf-binutils-gdb-2d924fd9ebc6a97f9ef93208597e563c88f5e9e8.tar.gz fsf-binutils-gdb-2d924fd9ebc6a97f9ef93208597e563c88f5e9e8.tar.bz2 |
* 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.
Diffstat (limited to 'gold/yyscript.y')
-rw-r--r-- | gold/yyscript.y | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gold/yyscript.y b/gold/yyscript.y index ec2e8c0..683273b 100644 --- a/gold/yyscript.y +++ b/gold/yyscript.y @@ -811,9 +811,15 @@ exp: | BLOCK '(' exp ')' { $$ = script_exp_function_align(script_exp_string(".", 1), $3); } | DATA_SEGMENT_ALIGN '(' exp ',' exp ')' - { $$ = script_exp_function_data_segment_align($3, $5); } + { + script_data_segment_align(closure); + $$ = script_exp_function_data_segment_align($3, $5); + } | DATA_SEGMENT_RELRO_END '(' exp ',' exp ')' - { $$ = script_exp_function_data_segment_relro_end($3, $5); } + { + script_data_segment_relro_end(closure); + $$ = script_exp_function_data_segment_relro_end($3, $5); + } | DATA_SEGMENT_END '(' exp ')' { $$ = script_exp_function_data_segment_end($3); } | SEGMENT_START '(' string ',' exp ')' |