diff options
| author | sje <sje@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-11-21 21:28:30 +0000 |
|---|---|---|
| committer | sje <sje@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-11-21 21:28:30 +0000 |
| commit | 8ad1eb9465c73fc88647c4c6e8a1999c6ad433f6 (patch) | |
| tree | ebff34b128e804f984878a2412e91ac7a0588891 /libcpp | |
| parent | 926ffdda8bb4574bcc4cf1412acee7e33f1ecfc8 (diff) | |
| download | gcc-8ad1eb9465c73fc88647c4c6e8a1999c6ad433f6.tar.gz | |
2012-11-21 Steve Ellcey <sellcey@mips.com>
PR pch/55399
* files.c (pch_open_file): Fix check for implicit_preinclude.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193709 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcpp')
| -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 30cef77e3e3..3b729b838b8 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 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); |