From: Neil Booth <neil@daikokuya.co.uk>
Date: Sun, 3 Aug 2003 09:28:25 +0000 (+0000)
Subject: cppfiles.c (stack_file): Use file path.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=76bf2c97952bda74591761d2ac1ac9eb1aa1697c;p=gcc.git

cppfiles.c (stack_file): Use file path.

	* cppfiles.c (stack_file): Use file path.
testsuite:
	* lib/dg-pch.exp: Work round PCH bug.

From-SVN: r70114
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e9e340f8a76..145cf2c179b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-03  Neil Booth  <neil@daikokuya.co.uk>
+
+	* cppfiles.c (stack_file): Use file path.
+
 2003-08-02  Roger Sayle  <roger@eyesopen.com>
 
 	* builtin-types.def (BT_SSIZE): New primitive type.
diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c
index 007eb09a0b1..8dcc269d106 100644
--- a/gcc/cppfiles.c
+++ b/gcc/cppfiles.c
@@ -621,7 +621,7 @@ stack_file (cpp_reader *pfile, _cpp_file *file, bool import)
   pfile->mi_cmacro = 0;
 
   /* Generate the call back.  */
-  _cpp_do_file_change (pfile, LC_ENTER, file->name, 1, sysp);
+  _cpp_do_file_change (pfile, LC_ENTER, file->path, 1, sysp);
 
   return true;
 }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 95a108dd47e..de8342ca9e7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-03  Neil Booth  <neil@daikokuya.co.uk>
+
+	* lib/dg-pch.exp: Work round PCH bug.
+
 2003-08-02  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* gcc.dg/builtins-1.c: Add macro helpers.  Add missing math
diff --git a/gcc/testsuite/lib/dg-pch.exp b/gcc/testsuite/lib/dg-pch.exp
index ca7d8c3c9e3..9bf39936593 100644
--- a/gcc/testsuite/lib/dg-pch.exp
+++ b/gcc/testsuite/lib/dg-pch.exp
@@ -39,7 +39,7 @@ proc dg-pch { subdir test options suffix } {
 	set dg-do-what-default precompile
 	catch { file delete "$bname$suffix" }
 	gcc_copy_files "[file rootname $test]${suffix}s" "$bname$suffix"
-	dg-test -keep-output "$bname$suffix" $flags ""
+	dg-test -keep-output "./$bname$suffix" $flags ""
 
 	# For the rest, the default is to compile to .s.
 	set dg-do-what-default compile