diff options
| -rw-r--r-- | libcpp/ChangeLog | 5 | ||||
| -rw-r--r-- | libcpp/files.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 30cef77..3b729b8 100644 --- 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 a8288dc..9f84d8c 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); |