aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/cppinit.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 901a849..3c8ca32 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-29 Zack Weinberg <zack@wolery.cumb.org>
+
+ * cppinit.c (cpp_start_read): Call initialize_dependency_output
+ only after reading in the primary source file.
+
2000-03-29 Geoff Keating <geoffk@cygnus.com>
* c-common.c (c_common_nodes_and_builtins): The first parameter to
diff --git a/gcc/cppinit.c b/gcc/cppinit.c
index 1410d73..6f54553 100644
--- a/gcc/cppinit.c
+++ b/gcc/cppinit.c
@@ -896,10 +896,8 @@ cpp_start_read (pfile, fname)
fprintf (stderr, _("End of search list.\n"));
}
- initialize_dependency_output (pfile);
-
- /* Open the main input file. This must be done before -D processing
- so we have a buffer to stand on. */
+ /* Open the main input file. This must be done early, so we have a
+ buffer to stand on. */
if (opts->in_fname == NULL || *opts->in_fname == 0)
{
opts->in_fname = fname;
@@ -910,6 +908,8 @@ cpp_start_read (pfile, fname)
if (!cpp_read_file (pfile, fname))
return 0;
+ initialize_dependency_output (pfile);
+
/* -D and friends may produce output, which should be identified
as line 0. */