diff options
| author | Cary Coutant <ccoutant@gmail.com> | 2015-03-21 19:03:00 -0700 |
|---|---|---|
| committer | Cary Coutant <ccoutant@gmail.com> | 2015-03-21 19:54:15 -0700 |
| commit | 410da591ba7814912e11be826b20dfba9abed9f7 (patch) | |
| tree | faf2cf11ec24592cfb68657240e3a620e9e357a9 /gold/script.cc | |
| parent | 0d5bbdb0e1d193fa6f6804f2620fbdfc950c57a4 (diff) | |
| download | binutils-gdb-410da591ba7814912e11be826b20dfba9abed9f7.tar.gz | |
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.
Diffstat (limited to 'gold/script.cc')
| -rw-r--r-- | gold/script.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gold/script.cc b/gold/script.cc index 5350afc6ad4..56f126c738a 100644 --- a/gold/script.cc +++ b/gold/script.cc @@ -3366,13 +3366,14 @@ script_parse_memory_attr(void* closurev, const char* attrs, size_t attrlen, } extern "C" void -script_include_directive(void* closurev, const char* filename, size_t length) +script_include_directive(int first_token, void* closurev, + const char* filename, size_t length) { Parser_closure* closure = static_cast<Parser_closure*>(closurev); std::string name(filename, length); Command_line* cmdline = closure->command_line(); read_script_file(name.c_str(), cmdline, &cmdline->script_options(), - PARSING_LINKER_SCRIPT, Lex::LINKER_SCRIPT); + first_token, Lex::LINKER_SCRIPT); } // Functions for memory regions. |