diff options
| author | geoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-22 06:51:56 +0000 |
|---|---|---|
| committer | geoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-22 06:51:56 +0000 |
| commit | d718b525701491becba5852fc642f13f9f1ed42f (patch) | |
| tree | 33b0e3a2356eea4890c97f802528ed3f9e8ceebd /libcpp | |
| parent | a61b7bc46d0b0850dba55f8cd8afc33d729f14b1 (diff) | |
| download | gcc-d718b525701491becba5852fc642f13f9f1ed42f.tar.gz | |
2004-06-21 Geoffrey Keating <geoffk@apple.com>
* c-opts.c (c_common_handle_option): Handle -fpch-preprocess.
* c-common.h (flag_pch_preprocess): Declare.
(c_common_pch_pragma): Likewise.
* c-common.c (flag_pch_preprocess): New.
* c-pch.c (c_common_read_pch): Support -fpreprocess-only.
(c_common_pch_pragma): New.
* c-ppoutput.c (cb_read_pch): New.
(init_pp_output): Support -fpch-preprocess.
* c-pragma.c (init_pragma): Support #pragma GNUC pch_preprocess.
* c.opt (fpch-preprocess): New.
* gcc.c (cpp_options): When save-temps, pass -fpch-preprocess.
* doc/cppopts.texi: Document -fpch-preprocess.
* doc/invoke.texi (Precompiled Headers): Mention that
-fpreprocessed is safe for PCH. Mention that if an option is
listed as safe that doesn't mean it does what you expect.
Index: gcc/testsuite/ChangeLog
2004-06-21 Geoffrey Keating <geoffk@apple.com>
* gcc.dg/pch/save-temps-1.c: New file.
* gcc.dg/pch/save-temps-1.hs: New file.
Index: libcpp/ChangeLog
2004-06-21 Geoffrey Keating <geoffk@apple.com>
* files.c (should_stack_file): Correct swapped parameters to call
to cb.read_pch.
* pch.c (cpp_valid_state): Handle -fpreprocessed.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@83478 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 6 | ||||
| -rw-r--r-- | libcpp/files.c | 2 | ||||
| -rw-r--r-- | libcpp/pch.c | 11 |
3 files changed, 17 insertions, 2 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 236c0685e4d..897d4ac0b26 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,9 @@ +2004-06-21 Geoffrey Keating <geoffk@apple.com> + + * files.c (should_stack_file): Correct swapped parameters to call + to cb.read_pch. + * pch.c (cpp_valid_state): Handle -fpreprocessed. + 2004-06-15 Paolo Bonzini <bonzini@gnu.org> * Makefile.in: Regenerate with automake 1.8.5. diff --git a/libcpp/files.c b/libcpp/files.c index 6a18d71a896..068065279ba 100644 --- a/libcpp/files.c +++ b/libcpp/files.c @@ -625,7 +625,7 @@ should_stack_file (cpp_reader *pfile, _cpp_file *file, bool import) /* Handle PCH files immediately; don't stack them. */ if (file->pch) { - pfile->cb.read_pch (pfile, file->path, file->fd, file->pchname); + pfile->cb.read_pch (pfile, file->pchname, file->fd, file->path); close (file->fd); file->fd = -1; return false; diff --git a/libcpp/pch.c b/libcpp/pch.c index a9d139a30b7..a343cd857f0 100644 --- a/libcpp/pch.c +++ b/libcpp/pch.c @@ -438,13 +438,22 @@ cpp_valid_state (cpp_reader *r, const char *name, int fd) if (m.name_length == 0) break; + /* If this file is already preprocessed, there won't be any + macros defined, and that's OK. */ + if (CPP_OPTION (r, preprocessed)) + { + if (lseek (fd, m.definition_length, SEEK_CUR) == -1) + goto error; + continue; + } + if (m.definition_length > namebufsz) { free (namebuf); namebufsz = m.definition_length + 256; namebuf = xmalloc (namebufsz); } - + if ((size_t)read (fd, namebuf, m.definition_length) != m.definition_length) goto error; |