From: H.J. Lu <hongjiu.lu@intel.com>
Date: Tue, 9 Nov 2010 13:14:48 +0000 (+0000)
Subject: Call get_input_file_name to get file name.
X-Git-Tag: releases/gcc-4.6.0~2790
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a618dbe3697d2f4a0dc14e2868f2d95e2a48888a;p=thirdparty%2Fgcc.git

Call get_input_file_name to get file name.

2010-11-09  H.J. Lu  <hongjiu.lu@intel.com>

	PR bootstrap/46392
	* gengtype-parse.c (type): Call get_input_file_name to get
	file name.

From-SVN: r166486
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3db49916f733..411cd90de630 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR bootstrap/46392
+	* gengtype-parse.c (type): Call get_input_file_name to get
+	file name.
+
 2010-11-09  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* tree.h (contains_placeholder_p): Fix comment.
diff --git a/gcc/gengtype-parse.c b/gcc/gengtype-parse.c
index 0f2e0c6463b2..476a9fd203c6 100644
--- a/gcc/gengtype-parse.c
+++ b/gcc/gengtype-parse.c
@@ -751,7 +751,9 @@ type (options_p *optsp, bool nested)
 	if (token () == ID)
 	  s = advance ();
 	else
-	  s = xasprintf ("anonymous:%s:%d", lexer_line.file, lexer_line.line);
+	  s = xasprintf ("anonymous:%s:%d",
+			 get_input_file_name (lexer_line.file),
+			 lexer_line.line);
 
 	/* Unfortunately above GTY_TOKEN check does not capture the
 	   typedef struct_type GTY case.  */
@@ -788,7 +790,9 @@ type (options_p *optsp, bool nested)
       if (token () == ID)
 	s = advance ();
       else
-	s = xasprintf ("anonymous:%s:%d", lexer_line.file, lexer_line.line);
+	s = xasprintf ("anonymous:%s:%d",
+		       get_input_file_name (lexer_line.file),
+		       lexer_line.line);
 
       if (token () == '{')
 	consume_balanced ('{', '}');