summaryrefslogtreecommitdiff
path: root/gcc/cppinit.c
diff options
context:
space:
mode:
authorneil <neil@138bc75d-0d04-0410-961f-82ee72b054a4>2001-08-17 22:23:49 +0000
committerneil <neil@138bc75d-0d04-0410-961f-82ee72b054a4>2001-08-17 22:23:49 +0000
commit5a9f87bb4f047042c9b67dc3d22c275b4c41c24d (patch)
tree1119c95193138295f135f3d1be8fd1f94c827ca3 /gcc/cppinit.c
parentd408664a548e346c6323cae2a41dd1156f8d9c33 (diff)
downloadgcc-5a9f87bb4f047042c9b67dc3d22c275b4c41c24d.tar.gz
* cpperror.c (print_location): Don't take a file name; use the
line map instead. (_cpp_begin_message): Similarly. (cpp_ice, cpp_fatal, cpp_error, cpp_error_with_line, cpp_warning, cpp_warning_with_line, cpp_pedwarn, cpp_pedwarn_with_line): Update. (cpp_pedwarn_with_file_and_line): Remove. * cppfiles.c (stack_include_file): Update; set filename to stdin here when appropriate. * cpphash.h (struct cpp_buffer): Remove nominal_fname. (_cpp_begin_message): Don't take a file name. * cppinit.c: Add comment. * cpplex.c: Fix end-of-directive indicator. * cpplib.c: Don't include intl.h. (run_directive, do_diagnostic): Update. (do_line): Update to not use nominal_fname. (cpp_push_buffer): Don't take a filename. * cpplib.h (struct ht): Remove. (cpp_push_buffer): Don't take a filename. (cpp_pedwarn_with_file_and_line): Remove. * cppmacro.c (struct cpp_macro): Remove file. (builtin_macro): Update. (_cpp_create_definition): Update. * cppmain.c: Correct comment. * fix-header.c (read_scan_file): Update. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44986 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cppinit.c')
-rw-r--r--gcc/cppinit.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gcc/cppinit.c b/gcc/cppinit.c
index 63bcfdd3735..4a78a938987 100644
--- a/gcc/cppinit.c
+++ b/gcc/cppinit.c
@@ -861,7 +861,7 @@ init_standard_includes (pfile)
|| (CPP_OPTION (pfile, cplusplus)
&& !CPP_OPTION (pfile, no_standard_cplusplus_includes)))
{
- char *str = xstrdup (update_path (p->fname, p->component));
+ char *str = update_path (p->fname, p->component);
append_include_chain (pfile, str, SYSTEM, p->cxx_aware);
}
}
@@ -939,6 +939,9 @@ cpp_start_read (pfile, fname)
if (!_cpp_read_file (pfile, fname))
return 0;
+ /* FIXME: we want to set up linemaps with _("<builtin>") and
+ _("<command line>") somewhere round here. Harder than it looks. */
+
/* If already preprocessed, don't install __LINE__, etc., and ignore
command line definitions and assertions. Handle -U's, -D's and
-A's in the order they were seen. */