re PR preprocessor/7862 (Interrupting gcc -MD removes .d file but not .o)

	PR preprocessor/7862
	PR preprocessor/8190
	* gcc.c (cpp_unique_options): Don't delete .d files.
	Remove stray whitespace.

From-SVN: r58088

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4a292ecdacd65a6da948c07ffb8dbec9523bb5b5..feb9a9db83b9adedcf982c687a3c41d37fc1ea6a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-12  Neil Booth  <neil@daikokuya.co.uk>
+
+       PR preprocessor/7862
+       PR preprocessor/8190
+       * gcc.c (cpp_unique_options): Don't delete .d files.
+       Remove stray whitespace.
+
 2002-10-12  Naohiko Shimizu  <pshimizu@fa2.so-net.ne.jp>
 
        * pdp11.h (ASM_OUTPUT_SKIP): Add preceding 0 for octal constant.

diff --git a/gcc/gcc.c b/gcc/gcc.c
index 4f360c86b69f861287fa6a2344a9fc95181c2940..1018513f5c76ce64dc7099aa58fc3680ef776e8f 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -673,13 +673,16 @@ static const char *startfile_prefix_spec = STARTFILE_PREFIX_SPEC;
 static const char *trad_capable_cpp =
 "cc1 -E %{traditional|ftraditional|traditional-cpp:-traditional-cpp}";
 
+/* We don't wrap .d files in %W{} since a missing .d file, and
+   therefore no dependency entry, confuses make into thinking a .o
+   file that happens to exist is up-to-date.  */
 static const char *cpp_unique_options =
 "%{C:%{!E:%eGNU C does not support -C without using -E}}\
  %{CC:%{!E:%eGNU C does not support -CC without using -E}}\
  %{!Q:-quiet} %{nostdinc*} %{C} %{CC} %{v} %{I*} %{P} %I\
- %{MD:-MD %W{!o: %b.d}%W{o*:%.d%*}}\
- %{MMD:-MMD %W{!o: %b.d}%W{o*:%.d%*}}\
- %{M} %{MM} %W{MF*} %{MG} %{MP} %{MQ*} %{MT*}\
+ %{MD:-MD %{!o:%b.d}%{o*:%.d%*}}\
+ %{MMD:-MMD %{!o:%b.d}%{o*:%.d%*}}\
+ %{M} %{MM} %{MF*} %{MG} %{MP} %{MQ*} %{MT*}\
  %{!E:%{!M:%{!MM:%{MD|MMD:%{o*:-MQ %*}}}}}\
  %{!no-gcc:-D__GNUC__=%v1 -D__GNUC_MINOR__=%v2 -D__GNUC_PATCHLEVEL__=%v3}\
  %{!undef:%{!ansi:%{!std=*:%p}%{std=gnu*:%p}} %P} %{trigraphs}\