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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ff07b408b82f59b3fec2bf028d141738325b907e..4a0fdff983668145ab797ecbe50b6b6d0111e7c3 100644 (file)
--- 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 0aac625f84c044bfde93f34259779f52c4ea679e..9f2b9f7b4c0f8ea6e8544d87c78d99be2e27d04d 100644 (file)
--- 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