From b47c42085628603e890a783b8d2a612d19f66396 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Sat, 20 Oct 2001 13:49:00 +0000
Subject: 	* 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.

---
 ld/ldgram.y | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'ld/ldgram.y')

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);
-- 
cgit v1.1