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 e9e340f8a76d1683a711c99f8dea7739c9efbbd7..145cf2c179b95bb9824b051189bbc496c36cbbf9 100644 (file)
--- 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 007eb09a0b186cc8abdc6b9889c7acbfc35b1680..8dcc269d1062b730c4be7da745fdf15b5ee962a8 100644 (file)
--- 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 95a108dd47ede2d6507cb089f9816b9472922c93..de8342ca9e71fa87036431eec2c9fa2a5bd92c55 100644 (file)
--- 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 ca7d8c3c9e3241eb899b89f9f2c982bf2a14b2cd..9bf39936593a9a82696d5dcbd456e795e299aa00 100644 (file)
--- 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