* diagnostic.c (warn_deprecated_use): Move to toplev.c

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 492f6d7..d545cd8 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2003-09-07  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
+       * diagnostic.c (warn_deprecated_use): Move to toplev.c
+
+2003-09-07  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
        * langhooks.c (lhd_print_error_function): Move from diagnostic.c.
        * Makefile.in (langhooks.o): Depend on diagnostic.h
 

diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c
index 8c8a86c..3d64b87 100644 (file)
--- a/gcc/diagnostic.c
+++ b/gcc/diagnostic.c
@@ -550,44 +550,6 @@ fnotice (FILE *file, const char *msgid, ...)
   va_end (ap);
 }
 
-/* Warn about a use of an identifier which was marked deprecated.  */
-void
-warn_deprecated_use (tree node)
-{
-  if (node == 0 || !warn_deprecated_decl)
-    return;
-
-  if (DECL_P (node))
-    warning ("`%s' is deprecated (declared at %s:%d)",
-            IDENTIFIER_POINTER (DECL_NAME (node)),
-            DECL_SOURCE_FILE (node), DECL_SOURCE_LINE (node));
-  else if (TYPE_P (node))
-    {
-      const char *what = NULL;
-      tree decl = TYPE_STUB_DECL (node);
-
-      if (TREE_CODE (TYPE_NAME (node)) == IDENTIFIER_NODE)
-       what = IDENTIFIER_POINTER (TYPE_NAME (node));
-      else if (TREE_CODE (TYPE_NAME (node)) == TYPE_DECL
-              && DECL_NAME (TYPE_NAME (node)))
-       what = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (node)));
-
-      if (what)
-       {
-         if (decl)
-           warning ("`%s' is deprecated (declared at %s:%d)", what,
-                    DECL_SOURCE_FILE (decl), DECL_SOURCE_LINE (decl));
-         else
-           warning ("`%s' is deprecated", what);
-       }
-      else if (decl)
-       warning ("type is deprecated (declared at %s:%d)",
-                DECL_SOURCE_FILE (decl), DECL_SOURCE_LINE (decl));
-      else
-       warning ("type is deprecated");
-    }
-}
-
 /* Inform the user that an error occurred while trying to report some
    other error.  This indicates catastrophic internal inconsistencies,
    so give up now.  But do try to flush out the previous error.

diff --git a/gcc/toplev.c b/gcc/toplev.c
index 92ef835..aa04138 100644 (file)
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -1702,6 +1702,44 @@ check_global_declarations (tree *vec, int len)
     }
 }
 
+/* Warn about a use of an identifier which was marked deprecated.  */
+void
+warn_deprecated_use (tree node)
+{
+  if (node == 0 || !warn_deprecated_decl)
+    return;
+
+  if (DECL_P (node))
+    warning ("`%s' is deprecated (declared at %s:%d)",
+            IDENTIFIER_POINTER (DECL_NAME (node)),
+            DECL_SOURCE_FILE (node), DECL_SOURCE_LINE (node));
+  else if (TYPE_P (node))
+    {
+      const char *what = NULL;
+      tree decl = TYPE_STUB_DECL (node);
+
+      if (TREE_CODE (TYPE_NAME (node)) == IDENTIFIER_NODE)
+       what = IDENTIFIER_POINTER (TYPE_NAME (node));
+      else if (TREE_CODE (TYPE_NAME (node)) == TYPE_DECL
+              && DECL_NAME (TYPE_NAME (node)))
+       what = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (node)));
+
+      if (what)
+       {
+         if (decl)
+           warning ("`%s' is deprecated (declared at %s:%d)", what,
+                    DECL_SOURCE_FILE (decl), DECL_SOURCE_LINE (decl));
+         else
+           warning ("`%s' is deprecated", what);
+       }
+      else if (decl)
+       warning ("type is deprecated (declared at %s:%d)",
+                DECL_SOURCE_FILE (decl), DECL_SOURCE_LINE (decl));
+      else
+       warning ("type is deprecated");
+    }
+}
+
 /* Save the current INPUT_LOCATION on the top entry in the
    INPUT_FILE_STACK.  Push a new entry for FILE and LINE, and set the
    INPUT_LOCATION accordingly.  */