PR gold/18048: Fix INCLUDE directive support for gold
authorCary Coutant <ccoutant@gmail.com>
Sun, 22 Mar 2015 02:03:00 +0000 (19:03 -0700)
committerCary Coutant <ccoutant@gmail.com>
Sun, 22 Mar 2015 02:54:15 +0000 (19:54 -0700)
commit410da591ba7814912e11be826b20dfba9abed9f7
treefaf2cf11ec24592cfb68657240e3a620e9e357a9
parent0d5bbdb0e1d193fa6f6804f2620fbdfc950c57a4
PR gold/18048: Fix INCLUDE directive support for gold

This patch fixes INCLUDE directives in script files, so that when
an INCLUDE appears inside a sections block, section commands block,
or memory def block, the contents are parsed in the appropriate
context.

gold/
PR gold/18048
* script-c.h (script_include_directive): Add first_token parameter.
* script.cc (script_include_directive): Add first_token parameter, and
pass it to read_script_file.
* yyscript.y (PARSING_SECTIONS_BLOCK, PARSING_SECTION_CMDS)
(PARSING_MEMORY_DEF): New tokens.
(top): Add new productions for INCLUDE files.
(file_cmd): Replace file_or_sections_cmd with copy of its productions.
Pass PARSING_LINKER_SCRIPT to script_include_directive.
(section_block_cmd): Likewise; pass PARSING_SECTIONS_BLOCK.
(section_cmd): Pass PARSING_SECTION_CMDS.
(file_or_sections_cmd): Remove.
(memory_def): Pass PARSING_MEMORY_DEF.
* testsuite/Makefile.am (memory_test_2): New test.
* testsuite/Makefile.in: Regenerate.
* testsuite/memory_test_inc.t: New script file.
* testsuite/memory_test_inc_1.t.src: New script file.
* testsuite/memory_test_inc_2.t.src: New script file.
* testsuite/memory_test_inc_3.t.src: New script file.
gold/ChangeLog
gold/script-c.h
gold/script.cc
gold/testsuite/Makefile.am
gold/testsuite/Makefile.in
gold/testsuite/memory_test_inc.t [new file with mode: 0644]
gold/testsuite/memory_test_inc_1.t.src [new file with mode: 0644]
gold/testsuite/memory_test_inc_2.t.src [new file with mode: 0644]
gold/testsuite/memory_test_inc_3.t.src [new file with mode: 0644]
gold/yyscript.y