re PR preprocessor/5899 (-M disables -dM)

	PR preprocessor/5899
	* cppinit.c (init_dependency_output): Don't ignore -dM etc.

From-SVN: r50545

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 53833dc00b4eaddd203ce1b6d02d0eeb7e83aed4..6d98f862c778c9ff07185fae8f651c9dcd6c5648 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-10  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+       PR preprocessor/5899
+       * cppinit.c (init_dependency_output): Don't ignore -dM etc.
+       
 2002-03-10  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * mbchar.c (JIS_state_table, JIS_action_table): Const-ify.

diff --git a/gcc/cppinit.c b/gcc/cppinit.c
index 386816725242b64f6c7538732b8427046b32f9d5..7c7f782eaae894878e0213cecb5c40698e588e9d 100644 (file)
--- a/gcc/cppinit.c
+++ b/gcc/cppinit.c
@@ -1881,15 +1881,13 @@ init_dependency_output (pfile)
       CPP_OPTION (pfile, print_deps_append) = 1;
     }
   else if (CPP_OPTION (pfile, deps_file) == 0)
-    /* If -M or -MM was seen, default output to wherever was specified
-       with -o.  out_fname is non-NULL here.  */
+    /* If -M or -MM was seen without -MF, default output to wherever
+       was specified with -o.  out_fname is non-NULL here.  */
     CPP_OPTION (pfile, deps_file) = CPP_OPTION (pfile, out_fname);
 
-  /* When doing dependencies, we should suppress all output, including
-     -dM, -dI etc.  */
+  /* When doing dependencies, suppress normal preprocessed output.
+     Still do -dM, -dI etc. as e.g. glibc depends on this.  */
   CPP_OPTION (pfile, no_output) = 1;
-  CPP_OPTION (pfile, dump_macros) = 0;
-  CPP_OPTION (pfile, dump_includes) = 0;
 }
 
 /* Handle --help output.  */