backport: re PR pch/68176 (all pch tests fail on eglibc systems (with bits/predefs.h))

	Backported from mainline
	2016-01-28  Jakub Jelinek  <jakub@redhat.com>

	PR pch/68176
	* files.c (_cpp_find_file): Set file->implicit_preinclude even if
	included from file->implicit_preinclude header.

From-SVN: r233335

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 0decbe9c36b5ea6e62186736e38d01dd98b8d8fe..7bd7afd92f1f04729bfc446c00783280305e00f6 100644 (file)
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,12 @@
+2016-02-11  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2016-01-28  Jakub Jelinek  <jakub@redhat.com>
+
+       PR pch/68176
+       * files.c (_cpp_find_file): Set file->implicit_preinclude even if
+       included from file->implicit_preinclude header.
+
 2016-02-11  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline

diff --git a/libcpp/files.c b/libcpp/files.c
index 144c0bc8260253331a52253e640a4ac7bd6b152b..2d87b7902b99e6e24baa845e7617d75a17db90b4 100644 (file)
--- a/libcpp/files.c
+++ b/libcpp/files.c
@@ -516,7 +516,10 @@ _cpp_find_file (cpp_reader *pfile, const char *fname, cpp_dir *start_dir,
     return entry->u.file;
 
   file = make_cpp_file (pfile, start_dir, fname);
-  file->implicit_preinclude = implicit_preinclude;
+  file->implicit_preinclude
+    = (implicit_preinclude
+       || (pfile->buffer
+          && pfile->buffer->file->implicit_preinclude));
 
   /* Try each path in the include chain.  */
   for (; !fake ;)