From 3196203294917e60746461b8146cfeb00d5c0a5b Mon Sep 17 00:00:00 2001 From: Steve Ellcey Date: Wed, 21 Nov 2012 21:28:30 +0000 Subject: [PATCH] re PR pch/55399 (pch tests fail on mips-mti-linux-gnu target) 2012-11-21 Steve Ellcey PR pch/55399 * files.c (pch_open_file): Fix check for implicit_preinclude. From-SVN: r193709 --- libcpp/ChangeLog | 5 +++++ libcpp/files.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 30cef77e3e3..3b729b838b8 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,8 @@ +2012-11-21 Steve Ellcey + + PR pch/55399 + * files.c (pch_open_file): Fix check for implicit_preinclude. + 2012-11-16 Simon Baldwin * include/cpplib.h (struct cpp_options): Add canonical_system_headers. diff --git a/libcpp/files.c b/libcpp/files.c index a8288dc934d..9f84d8c6e02 100644 --- 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);