re PR pch/55399 (pch tests fail on mips-mti-linux-gnu target)

2012-11-21  Steve Ellcey  <sellcey@mips.com>

	PR pch/55399
	* files.c (pch_open_file): Fix check for implicit_preinclude.

From-SVN: r193709

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 30cef77e3e319ab052c42e5ce582a04ce6771fe7..3b729b838b8cf0bddf6bab284c27670761ff2863 100644 (file)
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-21  Steve Ellcey  <sellcey@mips.com>
+
+       PR pch/55399
+       * files.c (pch_open_file): Fix check for implicit_preinclude.
+
 2012-11-16  Simon Baldwin  <simonb@google.com>
 
        * include/cpplib.h (struct cpp_options): Add canonical_system_headers.

diff --git a/libcpp/files.c b/libcpp/files.c
index a8288dc934d8ff69bd73575916a7d9b467967577..9f84d8c6e02ef9401ffd83e5e9cff1e3d91dd240 100644 (file)
--- a/libcpp/files.c
+++ b/libcpp/files.c
@@ -295,7 +295,8 @@ pch_open_file (cpp_reader *pfile, _cpp_file *file, bool *invalid_pch)
      file or the command-line it is not a valid use of PCH.  */
   if (pfile->all_files
       && pfile->all_files->next_file
-      && !pfile->all_files->next_file->implicit_preinclude)
+      && !(pfile->all_files->implicit_preinclude
+          || pfile->all_files->next_file->implicit_preinclude))
     return false;
 
   flen = strlen (path);