diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 789d74ec0dd..450c4811b6c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-24  Tom Tromey  <tromey@redhat.com>
+
+	* varpool.c (varpool_last_needed_node): Fix comment typo.
+	* c-decl.c (duplicate_decls): Fix comment typo.
+	(clone_underlying_type): Update comment.
+
 2007-08-24  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* config/alpha/alpha.c (alpha_mangle_type, decl_has_samegp,
diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index d6eb39aa45c..1625046a64f 100644
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -1930,7 +1930,7 @@ duplicate_decls (tree newdecl, tree olddecl)
 
   if (!diagnose_mismatched_decls (newdecl, olddecl, &newtype, &oldtype))
     {
-      /* Avoid `unused variable' and other warnings warnings for OLDDECL.  */
+      /* Avoid `unused variable' and other warnings for OLDDECL.  */
       TREE_NO_WARNING (olddecl) = 1;
       return false;
     }
@@ -2028,11 +2028,7 @@ warn_if_shadowing (tree new_decl)
 
     Obviously, we don't want to generate a duplicate ..._TYPE node if
     the TYPE_DECL node that we are now processing really represents a
-    standard built-in type.
-
-    Since all standard types are effectively declared at line zero
-    in the source file, we can easily check to see if we are working
-    on a standard type by checking the current value of lineno.  */
+    standard built-in type.  */
 
 static void
 clone_underlying_type (tree x)
diff --git a/gcc/varpool.c b/gcc/varpool.c
index 9be16417de4..719f212cbf5 100644
--- a/gcc/varpool.c
+++ b/gcc/varpool.c
@@ -57,8 +57,9 @@ struct varpool_node *varpool_nodes;
    The queue is maintained via mark_needed_node, linked via node->next_needed
    pointer. 
 
-   LAST_NNEDED_NODE points to the end of queue, so it can be maintained in forward
-   order.  QTY is needed to make it friendly to PCH.
+   LAST_NEEDED_NODE points to the end of queue, so it can be
+   maintained in forward order.  QTY is needed to make it friendly to
+   PCH.
  
    During unit-at-a-time compilation we construct the queue of needed variables
    twice: first time it is during cgraph construction, second time it is at the