diff options
| author | Alan Modra <amodra@gmail.com> | 2001-10-20 13:49:00 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2001-10-20 13:49:00 +0000 |
| commit | b47c42085628603e890a783b8d2a612d19f66396 (patch) | |
| tree | 8ce3bd00189f2d2b7172db7735c5f7587b9e1fb9 /ld/ldgram.y | |
| parent | fd521b4750cb0df1c841700637de89a7b25cccf3 (diff) | |
| download | fsf-binutils-gdb-b47c42085628603e890a783b8d2a612d19f66396.zip fsf-binutils-gdb-b47c42085628603e890a783b8d2a612d19f66396.tar.gz fsf-binutils-gdb-b47c42085628603e890a783b8d2a612d19f66396.tar.bz2 | |
* ldgram.y (mri_script_command): Surround processing of INCLUDE
with ldlex_script, ldlex_popstate.
(ifile_p1): Likewise.
* ldlex.l (EOF): Don't BEGIN(SCRIPT). Restore lineno from the
correct slot.
(lex_push_file): Save current lineno to lineno_stack. Set lineno
to 1. Don't BEGIN(SCRIPT).
(lex_redirect): Similarly.
* ldmain.c (main): Set yydebug non-zero if YYDEBUG.
Diffstat (limited to 'ld/ldgram.y')
| -rw-r--r-- | ld/ldgram.y | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ld/ldgram.y b/ld/ldgram.y index 25d8d09..c57ad15 100644 --- a/ld/ldgram.y +++ b/ld/ldgram.y @@ -238,7 +238,9 @@ mri_script_command: | CASE casesymlist | EXTERN extern_name_list | INCLUDE filename - { ldfile_open_command_file ($2); } mri_script_lines END + { ldlex_script (); ldfile_open_command_file($2); } + mri_script_lines END + { ldlex_popstate (); } | START NAME { lang_add_entry ($2, false); } | @@ -332,7 +334,9 @@ ifile_p1: | MAP '(' filename ')' { lang_add_map($3); } | INCLUDE filename - { ldfile_open_command_file($2); } ifile_list END + { ldlex_script (); ldfile_open_command_file($2); } + ifile_list END + { ldlex_popstate (); } | NOCROSSREFS '(' nocrossref_list ')' { lang_add_nocrossref ($3); |