* cppinit.c (init): Rename init_library.

        (cpp_create_reader): Update.
        * gcc.c (cpp_options): If -o given, use it as the target of
        any -M options.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38805 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 363513a..98cd34e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2001-01-08  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+        * cppinit.c (init): Rename init_library.
+        (cpp_create_reader): Update.
+        * gcc.c (cpp_options): If -o given, use it as the target of
+        any -M options.
+
 2001-01-08  Richard Earnshaw  <rearnsha@arm.com>
 
        * arm.c (arm_arch5e): New variable.

diff --git a/gcc/cppinit.c b/gcc/cppinit.c
index 85a351c..12844d9 100644 (file)
--- a/gcc/cppinit.c
+++ b/gcc/cppinit.c
@@ -94,7 +94,7 @@ struct cpp_pending
 static void print_help                  PARAMS ((void));
 static void path_include               PARAMS ((cpp_reader *,
                                                 char *, int));
-static void init                       PARAMS ((void));
+static void init_library               PARAMS ((void));
 static void init_builtins              PARAMS ((cpp_reader *));
 static void append_include_chain       PARAMS ((cpp_reader *,
                                                 char *, int, int));
@@ -469,7 +469,7 @@ opt_comp (p1, p2)
    do anything depending on the platform and compiler.  */
 
 static void
-init ()
+init_library ()
 {
   static int initialized = 0;
 
@@ -499,7 +499,7 @@ cpp_create_reader (lang)
   cpp_reader *pfile;
 
   /* Initialise this instance of the library if it hasn't been already.  */
-  init ();
+  init_library ();
 
   pfile = (cpp_reader *) xcalloc (1, sizeof (cpp_reader));
 

diff --git a/gcc/gcc.c b/gcc/gcc.c
index 7a3c364..d17cb13 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -587,6 +587,7 @@ static const char *cpp_options =
  %{std*} %{nostdinc*}\
  %{C} %{v} %{I*} %{P} %{$} %I\
  %{M} %{MM} %{MD:-M -MF %b.d} %{MMD:-MM -MF %b.d} %{MF} %{MG} %{MP} %{MQ} %{MT}\
+ %{M|MD|MM|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}\
  %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\