From 76bf2c97952bda74591761d2ac1ac9eb1aa1697c Mon Sep 17 00:00:00 2001
From: Neil Booth <neil@daikokuya.co.uk>
Date: Sun, 3 Aug 2003 09:28:25 +0000
Subject: [PATCH] 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
---
gcc/ChangeLog | 4 ++++
gcc/cppfiles.c | 2 +-
gcc/testsuite/ChangeLog | 4 ++++
gcc/testsuite/lib/dg-pch.exp | 2 +-
4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e9e340f8a76d..145cf2c179b9 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 007eb09a0b18..8dcc269d1062 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 95a108dd47ed..de8342ca9e71 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 ca7d8c3c9e32..9bf39936593a 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
--
GitLab