aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorNeil Booth <neil@daikokuya.demon.co.uk>2001-07-29 14:40:45 +0000
committerNeil Booth <neil@gcc.gnu.org>2001-07-29 14:40:45 +0000
commitdf07e07d1a0f83cc18efc5f901dfd4fb262d538a (patch)
tree1d1e3b28b0edb3a1bf0166c1b548080361cf1fed /gcc
parent7729617cf8cee0d354cd9c44e4ffc0f0de899b5d (diff)
downloadgcc-df07e07d1a0f83cc18efc5f901dfd4fb262d538a.zip
gcc-df07e07d1a0f83cc18efc5f901dfd4fb262d538a.tar.gz
gcc-df07e07d1a0f83cc18efc5f901dfd4fb262d538a.tar.bz2
re PR preprocessor/3669 (-M -g3 outputs macros as well as dependency info)
PR preprocessor/3669 * cppinit.c (init_dependency_output): Turn off dump requests if sending dependencies to stdout. From-SVN: r44457
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/cppinit.c10
2 files changed, 12 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ff07b40..4a0fdff 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-29 Neil Booth <neil@daikokuya.demon.co.uk>
+
+ PR preprocessor/3669
+ * cppinit.c (init_dependency_output): Turn off dump requests
+ if sending dependencies to stdout.
+
2001-07-28 Richard Henderson <rth@redhat.com>
* flow.c (life_analysis): Elide PROP_ALLOW_CFG_CHANGES if
diff --git a/gcc/cppinit.c b/gcc/cppinit.c
index 0aac625..9f2b9f7 100644
--- a/gcc/cppinit.c
+++ b/gcc/cppinit.c
@@ -1765,12 +1765,14 @@ init_dependency_output (pfile)
}
/* If dependencies go to standard output, or -MG is used, we should
- suppress output. The user may be requesting other stuff to
- stdout, with -dM, -v etc. We let them shoot themselves in the
- foot. */
+ suppress output, including -dM, -dI etc. */
if (CPP_OPTION (pfile, deps_file) == 0
|| CPP_OPTION (pfile, print_deps_missing_files))
- CPP_OPTION (pfile, no_output) = 1;
+ {
+ CPP_OPTION (pfile, no_output) = 1;
+ CPP_OPTION (pfile, dump_macros) = 0;
+ CPP_OPTION (pfile, dump_includes) = 0;
+ }
}
static void