diff options
| author | Per Bothner <per@bothner.com> | 2004-02-04 22:52:26 -0800 |
|---|---|---|
| committer | Per Bothner <bothner@gcc.gnu.org> | 2004-02-04 22:52:26 -0800 |
| commit | 8e9ea4d72c8f0909db7eda507805a941d48348a2 (patch) | |
| tree | a8cb79fee4ffa92207a17795cfa3750745b8d001 /gcc/c-common.h | |
| parent | 5384443a5f76667b12ccde8451b5a59faefb36da (diff) | |
| download | gcc-8e9ea4d72c8f0909db7eda507805a941d48348a2.tar.gz | |
Partially revert/redo 2003-10-01 change; fix -fworking-directory.
* c-ppoutput.c (pp_dir_change): New function.
* c-common.h (pp_dir_change): New declaration.
* cpplib.h (struct cpp_options): Remove working_directory field.
* cppinit.c (cpp_find_main_file, cpp_push_main_file): Merge back to
(cpp_read_main_file): as before 10-01. Call _cpp_stack_file.
Don't handle -fworking_directory here, but in c_common_post_options.
(read_original_directory): Don't back up when done.
Don't clear no-longer used working_directory flag.
* cpplib.h: Update declarations to match.
* c-lex.c (cb_dir_change): Move to c-opts.c.
(init_c_lex): Don't set dir_change callback here, since we want
to set it even if flag_preprocess_only.
* c-opts.c (cb_dir_change): Function moved from c-lex.c.
(c_common_post_options): Set dir_change callback.
Call pp_dir_change if approporiate.
(finish_options): Don't call cpp_find_main_file here. Hence remove
unneeded parameter and result. Do LC_RENAME for <built-in>.
(c_common_post_options): Call cpp_read_main_file here instead.
(c_common_init): Update accordingly.
(push_command_line_include): Don't cpp_push_main_file.
Do LC_RENAME rather than LC_LEASE to get back to main file.
Compared to pre-10-01 version, inline cpp_rename_to_main_file.
(c_common_parse_file): Call cpp_read_main_file for subsequent main
files, but call finish_options for all files.
* c-opts.c (sanitize_cpp_opts): Don't set cpp_opts->working_directory.
* fix-header.c (read_scan_file): Call cpp_read_main_file instead of
cpp_find_main_file + cpp_push_main_file.
* c-lex.c (fe_file_change): Don't set main_input_filename here.
* opts.c (handle_options): Only set main_input_filename first time.
From-SVN: r77303
Diffstat (limited to 'gcc/c-common.h')
| -rw-r--r-- | gcc/c-common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gcc/c-common.h b/gcc/c-common.h index aec0fc569e0..f948e44c694 100644 --- a/gcc/c-common.h +++ b/gcc/c-common.h @@ -1340,5 +1340,6 @@ extern void objc_mark_locals_volatile (void *); extern void init_pp_output (FILE *); extern void preprocess_file (cpp_reader *); extern void pp_file_change (const struct line_map *); +extern void pp_dir_change (cpp_reader *, const char *); #endif /* ! GCC_C_COMMON_H */ |